Changeset 3384 for trunk

Timestamp:

Jun 10, 2007, 1:12:12 PM (18 years ago)

Author:

bird

Message:

Count the whole environment. Fixes #170. pulIdSession and ppid can be NULL, don't crash if they are and pass the correct values to DosStartSession. Fixes #169.

File:

• trunk/libc/src/libos2/safe/SafeDosStartSession.c (modified) (3 diffs)

trunk/libc/src/libos2/safe/SafeDosStartSession.c

@@ -84 +84 @@
     if (SAFE_IS_HIGH(Environment))
     {
-        l4 = strlen((const char *)Environment) + 1;
+        const char *psz = Environment;
+        while (*psz)
+            psz = strchr(psz, '\0') + 1;
+        l4 = psz - Environment + 1;
         cbSafe += l4;
     }
@@ -149 +152 @@
         pchSafeMem = NULL;
 
-    rc = DosStartSession(psd, &ulIdSession, &pid);
+    rc = DosStartSession(psd,
+                         pulIdSession ? &ulIdSession : NULL,
+                         ppid ? &pid : NULL);
 
     /** @todo One should *NOT* modify the input structure but make a COPY!!! */
@@ -160 +165 @@
     psd->IconFile = IconFile;
 
-    /* Save returned values */
+    /* Set return values */
     if (ObjectBuffLen)
         memcpy(ObjectBuffer, psd->ObjectBuffer, ObjectBuffLen);
     psd->ObjectBuffer = ObjectBuffer;
+    if (pulIdSession)
     *pulIdSession = ulIdSession;
+    if (ppid)
     *ppid = pid;
 
-    if (pchSafeMem) free( pchSafeMem );
+    /* cleanup and return. */
+    if (pchSafeMem)
+        free(pchSafeMem);
     return rc;