Changeset 8327 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Apr 29, 2002, 7:05:30 PM (23 years ago)

Author:

sandervl

Message:

PH: memory leak fixes; extra checks for NULL pointers; CreateProcess changes for debug option; GetModuleFileName doesn't count 0 terminator

File:

• trunk/src/kernel32/wprocess.cpp (modified) (11 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.149 2002-02-26 11:11:17 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.150 2002-04-29 17:05:30 sandervl Exp $ */
 
 /*
@@ -340 +340 @@
         }
         threadListMutex.leave();
-
+      
+        // PH 2002-04-11
+        // free allocated memory
+        free( winteb->o.odin.threadinfo.pTokenGroups );
+      
+#ifdef DEBUG
+        if (winteb->o.odin.arrstrCallStack != NULL)
+          free( winteb->o.odin.arrstrCallStack );
+#endif
+      
         //Restore our original FS selector
         SetFS(orgtibsel);
@@ -1203 +1212 @@
          */
         cch = strlen(pszPeExe)+1;
+      
+        // PH 2002-04-11
+        // Note: intentional memory leak, pszCmdLineW will not be freed
+        // or allocated after process startup
         pszCmdLineA = psz = (PSZ)malloc(cch);
         if (psz == NULL)
@@ -1304 +1317 @@
     if (rc == NO_ERROR)
     {
+      // PH 2002-04-11
+      // Note: intentional memory leak, pszCmdLineW will not be freed
+      // or allocated after process startup
         pszCmdLineW = (WCHAR*)malloc(cch * 2);
         if (pszCmdLineW != NULL)
@@ -1402 +1418 @@
  *              terminating '\0'.
  *              On error 0 is returned. Last error is set.
+ *
+ *              2002-04-25 PH
+ *              Q - Do we set ERROR_BUFFER_OVERFLOW when cch > cchPath?
+ *              Q - Does NT really set the last error?
+ *              A > Win2k does not set LastError here, remains OK
+ *
+ *              While GetModuleFileName does add a trailing termination zero
+ *              if there is enough room, the returned number of characters
+ *              *MUST NOT* include the zero character!
+ *              (Notes R6 Installer on Win2kSP6, verified Testcase)
+ *
  * @param       hModule     Handle to the module you like to get the file name to.
  * @param       lpszPath    Output buffer for full path and file name.
@@ -1421 +1448 @@
  * @author      knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  *              Sander van Leeuwen (sandervl@xs4all.nl)
+ *              Patrick Haller     (patrick.haller@innotek.de)
  * @remark      - Do we still have to call Open32?
- *              - Do we set ERROR_BUFFER_OVERFLOW when cch > cchPath?
- *              - Does NT really set the last error?
  */
 DWORD WIN32API GetModuleFileNameA(HMODULE hModule, LPTSTR lpszPath, DWORD cchPath)
 {
     Win32ImageBase *    pMod;           /* Pointer to the module object. */
-    DWORD               cch;            /* Length of the  */
-
+    DWORD               cch = 0;        /* Length of the  */
+  
+    // PH 2002-04-24 Note:
+    // WIN2k just crashes in NTDLL if lpszPath is invalid!
     if (!VALID_PSZ(lpszPath))
     {
@@ -1444 +1472 @@
         if (pszFn)
         {
-            cch = strlen(pszFn) + 1;
-            if (cch > cchPath)
-                cch = cchPath;
+            cch = strlen(pszFn);
+            if (cch >= cchPath)
+              cch = cchPath;
+            else
+              // if there is sufficient room for the zero termination,
+              // write it additionally, uncounted
+              lpszPath[cch] = '\0';
+              
             memcpy(lpszPath, pszFn, cch);
-            lpszPath[cch - 1] = '\0';
         }
         else
@@ -1463 +1495 @@
         //(console init only it seems...)
         cch = OSLibDosGetModuleFileName(hModule, lpszPath, cchPath);
-        if (cch > 0)    cch++;          /* Open32 doesn't count the terminator. */
     }
 
@@ -1794 +1825 @@
 
     DWORD Characteristics, SubSystem, fNEExe;
-    if(Win32ImageBase::isPEImage(szAppName, &Characteristics, &SubSystem, &fNEExe) == 0) {
-        char *lpszPE;
-        if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) {
-             lpszPE = "PEC.EXE";
-        }
-        else lpszPE = "PE.EXE";
-
+    if(Win32ImageBase::isPEImage(szAppName, &Characteristics, &SubSystem, &fNEExe) == 0)
+    {
+      char *lpszPE;
+      char *lpszExecutable;
+      int  iNewCommandLineLength;
+
+      // calculate base length for the new command line
+      iNewCommandLineLength = strlen(szAppName) + strlen(lpCommandLine);
+      
+      if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI)
+        lpszExecutable = "PEC.EXE";
+      else
+        lpszExecutable = "PE.EXE";
+      
+      lpszPE = lpszExecutable;
+      
+      // 2002-04-24 PH
+      // set the ODIN32.DEBUG_CHILD environment variable to start new PE processes
+      // under a new instance of the (IPMD) debugger.
+#ifdef DEBUG
+      CHAR debug_szPE[ 512 ];
+      PSZ debug_pszOS2Debugger  = getenv("ODIN32.DEBUG_CHILD");
+      if (NULL != debug_pszOS2Debugger)
+      {
+        // build new start command
+        strcpy(debug_szPE, debug_pszOS2Debugger);
+        strcat(debug_szPE, " ");
+        strcat(debug_szPE, lpszExecutable);
+        
+        // we require more space in the new command line
+        iNewCommandLineLength += strlen( debug_szPE );
+        
+        // only launch the specified executable (ICSDEBUG.EXE)
+        lpszPE = debug_szPE;
+        lpszExecutable = debug_pszOS2Debugger;
+      }
+#endif
+      
         //SvL: Allright. Before we call O32_CreateProcess, we must take care of
         //     lpCurrentDirectory ourselves. (Open32 ignores it!)
@@ -1806 +1868 @@
             char *newcmdline;
 
-            newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + strlen(szAppName) + strlen(lpCommandLine) + 32);
+            newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + iNewCommandLineLength + 32);
             sprintf(newcmdline, "%s /OPT:[CURDIR=%s] %s %s", lpszPE, lpCurrentDirectory, szAppName, lpCommandLine);
             free(cmdline);
@@ -1814 +1876 @@
             char *newcmdline;
 
-            newcmdline = (char *)malloc(strlen(szAppName) + strlen(lpCommandLine) + 16);
+            newcmdline = (char *)malloc(iNewCommandLineLength + 16);
             sprintf(newcmdline, "%s %s %s", lpszPE, szAppName, lpCommandLine);
             free(cmdline);
             cmdline = newcmdline;
         }
-        rc = O32_CreateProcess(lpszPE, (LPCSTR)cmdline,lpProcessAttributes,
+      
+        dprintf(("KERNEL32: CreateProcess starting [%s],[%s]",
+                 lpszExecutable,
+                 cmdline));
+      
+        rc = O32_CreateProcess(lpszExecutable, (LPCSTR)cmdline,lpProcessAttributes,
                                lpThreadAttributes, bInheritHandles, dwCreationFlags,
                                lpEnvironment, lpCurrentDirectory, lpStartupInfo,