Changeset 3177 for trunk/src

Timestamp:

Mar 21, 2018, 11:06:08 PM (7 years ago)

Author:

bird

Message:

kBuiltinOptEnvDuplicat, append: Fixed allocation bug in kBuiltinOptEnvDuplicate; improved out of memory message so.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• append.c (modified) (2 diffs)
• common-env-and-cwd-opt.c (modified) (9 diffs)

trunk/src/kmk/kmkbuiltin/append.c

@@ -123 +123 @@
             pBuf->pszBuf = NULL;
             pBuf->cbBuf  = 0;
+            pBuf->offBuf = offNew;
             pBuf->fOutOfMemory = 1;
             return;
@@ -448 +449 @@
     }
     else
-        rc = errx(1, "out of memory!");
+        rc = errx(1, "out of memory for output buffer! (%u needed)", OutBuf.offBuf + 1);
     return rc;
 }

trunk/src/kmk/kmkbuiltin/common-env-and-cwd-opt.c

@@ -58 +58 @@
 static char **kBuiltinOptEnvDuplicate(char **papszEnv, unsigned cEnvVars, unsigned *pcAllocatedEnvVars, int cVerbosity)
 {
-    unsigned cAllocatedEnvVars = (cEnvVars + 2 + 0xf) * ~(unsigned)0xf;
+    unsigned cAllocatedEnvVars = (cEnvVars + 2 + 0xf) & ~(unsigned)0xf;
     char    **papszEnvNew      = malloc(cAllocatedEnvVars * sizeof(papszEnvNew[0]));
     assert(*pcAllocatedEnvVars == 0);
@@ -72 +72 @@
                     free(papszEnvNew[i]);
                 free(papszEnvNew);
-                errx(1, "out of memory");
+                errx(1, "out of memory for duplicating environment variables!", i);
                 return NULL;
             }
@@ -80 +80 @@
     }
     else
-        errx(1, "out of memory");
+        errx(1, "out of memory for duplicating environment vector!");
     return papszEnvNew;
 }
@@ -109 +109 @@
         papszEnv = (char **)realloc(papszEnv, *pcAllocatedEnvVars * sizeof(papszEnv[0]));
         if (!papszEnv)
-            return errx(1, "out of memory!");
+            return errx(1, "out of memory growing environment vector!");
         *ppapszEnv = papszEnv;
     }
     papszEnv[cEnvVars] = strdup(pszValue);
     if (!papszEnv[cEnvVars])
-        return errx(1, "out of memory!");
+        return errx(1, "out of memory adding environment variable!");
     papszEnv[++cEnvVars]   = NULL;
     *pcEnvVars = cEnvVars;
@@ -181 +181 @@
             papszEnv = kBuiltinOptEnvDuplicate(papszEnv, cEnvVars, pcAllocatedEnvVars, cVerbosity);
             if (!papszEnv)
-                return errx(1, "out of memory!");
+                return errx(1, "out of memory duplicating enviornment (setenv)!");
             *ppapszEnv = papszEnv;
         }
@@ -196 +196 @@
                 papszEnv[iEnvVar] = strdup(pszValue);
                 if (!papszEnv[iEnvVar])
-                    return errx(1, "out of memory!");
+                    return errx(1, "out of memory for modified environment variable!");
 
                 return kBuiltinOptEnvRemoveDuplicates(papszEnv, cEnvVars, cVerbosity, pszValue, cchVar, iEnvVar);
@@ -234 +234 @@
             papszEnv = kBuiltinOptEnvDuplicate(papszEnv, cEnvVars, pcAllocatedEnvVars, cVerbosity);
             if (!papszEnv)
-                return errx(1, "out of memory!");
+                return errx(1, "out of memory duplicating environment (append)!");
             *ppapszEnv = papszEnv;
         }
@@ -248 +248 @@
                 char  *pszNew      = malloc(cchVar + 1 + cchOldValue + cchNewValue + 1);
                 if (!pszNew)
-                    return errx(1, "out of memory!");
+                    return errx(1, "out of memory appending to environment variable!");
                 if (fAppend)
                 {
@@ -345 +345 @@
                     papszEnv = kBuiltinOptEnvDuplicate(papszEnv, cEnvVars, pcAllocatedEnvVars, cVerbosity);
                     if (!papszEnv)
-                        return errx(1, "out of memory!");
+                        return errx(1, "out of memory duplicating environment (unset)!");
                     *ppapszEnv = papszEnv;
                 }