Changeset 2932 in kBuild for trunk/src/kWorker/kWorker.c

Timestamp:

Sep 18, 2016 4:20:11 PM (8 years ago)

Author:

bird

Message:

kWorker.c: Don't call kwSandboxGrowEnv unless it's necessary. Duh.

File:

• trunk/src/kWorker/kWorker.c (modified) (7 diffs)

trunk/src/kWorker/kWorker.c

@@ -3124 +3124 @@
         cNew += 256;
 
-
     pvNew = kHlpRealloc(pSandbox->environ, cNew * sizeof(pSandbox->environ[0]));
     if (pvNew)
@@ -4093 +4092 @@
         {
             //static int s_cDbgGets = 0;
-            KU32 cchProc = kHlpStrLen(pszProc);
+            KU32 cchProc = (KU32)kHlpStrLen(pszProc);
             KU32 i = g_cSandboxGetProcReplacements;
             while (i-- > 0)
@@ -7846 +7845 @@
     KSIZE cbCmdLine;
     KU32 i;
-    int rc;
 
     /* Simple stuff. */
@@ -7904 +7902 @@
 
     /*
-     * Setup the enviornment.
+     * Setup the environment.
      */
-    rc = kwSandboxGrowEnv(pSandbox, cEnvVars + 2);
-    if (rc == 0)
+    if (   cEnvVars + 2 <= pSandbox->cEnvVarsAllocated
+        || kwSandboxGrowEnv(pSandbox, cEnvVars + 2) == 0)
     {
         KU32 iDst = 0;
@@ -7943 +7941 @@
     }
     else
-        return kwErrPrintfRc(KERR_NO_MEMORY, "Error setting up environment variables: %d\n", rc);
+        return kwErrPrintfRc(KERR_NO_MEMORY, "Error setting up environment variables: kwSandboxGrowEnv failed\n");
 
     /*
@@ -8335 +8333 @@
  * @param   fWatcomBrainDamange Whether to apply watcom rules while quoting.
  * @param   cEnvVars            The number of environment variables.
- * @param   papszEnvVars        The enviornment vector.
+ * @param   papszEnvVars        The environment vector.
  * @param   cPostCmdArgs        Number of post command arguments (includes cmd).
  * @param   papszPostCmdArgs    The post command and its argument.
@@ -9096 +9094 @@
  * with the kRedirect command, but not the file redirection.  So long no file
  * operation is involed, kSubmit is a drop in kRedirect replacement.  This is
- * hand for tools like OpenWatcom, NASM and YASM which all require enviornment
+ * hand for tools like OpenWatcom, NASM and YASM which all require environment
  * and/or current directory changes to work.
  *