Changeset 3785

Timestamp:

Mar 22, 2012, 7:36:39 PM (13 years ago)

Author:

bird

Message:

spawnve.c: fixed memmove in the bang-hash-script path that moved too much and could cause heap trouble under the right weather conditions. Fixes #253.

Location:

trunk/libc/src/kNIX/os2

Files:

• . (modified) (1 prop)
• __spawnve.c (modified) (3 diffs)

trunk/libc/src/kNIX/os2/__spawnve.c

@@ -178 +178 @@
   while (cbArgs + n > cbArgsBuf) \
     { \
+      char *pszOld = pszArgsBuf; \
       cbArgsBuf += 512; \
       pszArgsBuf = _trealloc (pszArgsBuf, cbArgsBuf); \
-      if (pszArgsBuf == NULL) \
+      if (__predict_false(pszArgsBuf == NULL)) \
         { \
+          _tfree (pszOld); \
           errno = ENOMEM; \
           LIBCLOG_RETURN_INT(-1); \
@@ -236 +238 @@
 
     /*
-     * cmd.exe and 4os2.exe needs different argument handling, and 
-     * starting with kLIBC 0.6.4 we can pass argv directly to LIBC 
+     * cmd.exe and 4os2.exe needs different argument handling, and
+     * starting with kLIBC 0.6.4 we can pass argv directly to LIBC
      * programs.
      * (1 == cmd or 4os2 shell, 0 == anything else)
@@ -531 +533 @@
 
                 /* grow and shift the argument buffer. */
+                size_t cbToMove = cbArgs; /* (ADD modifies cbArgs) */
                 ADD(cch);
                 psz = pszArgsBuf + strlen(pszArgsBuf) + 1;
-                memmove(psz + cch, psz, cbArgs);
+                memmove(psz + cch, psz, cbToMove);
 
                 /* add arguments */