Changeset 3235 in kBuild for trunk/src/lib/quote_argv.c

Timestamp:

Oct 28, 2018 2:15:29 PM (6 years ago)

Author:

bird

Message:

lib/quote_argv.c: Fixed heap corruption bug when applying the watcom-passthru hack to an argument needing quoting. We'd continue with the string following the argument and eventually trample the heap. Fix was to use 'continue' in the passthru case.

File:

• trunk/src/lib/quote_argv.c (modified) (2 diffs)

trunk/src/lib/quote_argv.c

@@ -122 +122 @@
             int    fComplicated = pszQuotes || (cchOrg > 0 && pszOrg[cchOrg - 1] == '\\');
             size_t cchNew       = fComplicated ? cchOrg * 2 + 2 : cchOrg + 2;
-            char  *pszNew       = (char *)malloc(cchNew + 1 /*term*/ + 3 /*passthru hack*/);
+            char  *pszNew       = (char *)malloc(cchNew + 1 /*term*/);
             if (!pszNew)
                 return -1;
@@ -138 +138 @@
                 else if (pszOrg[0] == '-' || pszOrg[0] == '/') /* Switch quoting. */
                 {
+                    const char *pszNeedQuoting;
                     if (isWatcomPassThruOption(pszOrg))
-                        cchUnquoted = strlen(pszOrg) + 1;
+                    {
+                        argv[i] = pszOrgOrg;
+                        free(pszNew);
+                        continue; /* No quoting needed, skip to the next argument. */
+                    }
+
+                    pszNeedQuoting = (const char *)memchr(pszOrg, '=', cchOrg); /* For -i=dir and similar. */
+                    if (   pszNeedQuoting == NULL
+                        || (uintptr_t)pszNeedQuoting > (uintptr_t)(pszProblem ? pszProblem : pszQuotes))
+                        pszNeedQuoting = pszProblem ? pszProblem : pszQuotes;
                     else
-                    {
-                        const char *pszNeedQuoting = (const char *)memchr(pszOrg, '=', cchOrg); /* For -i=dir and similar. */
-                        if (   pszNeedQuoting == NULL
-                            || (uintptr_t)pszNeedQuoting > (uintptr_t)(pszProblem ? pszProblem : pszQuotes))
-                            pszNeedQuoting = pszProblem ? pszProblem : pszQuotes;
-                        else
-                            pszNeedQuoting++;
-                        cchUnquoted = pszNeedQuoting - pszOrg;
-                    }
+                        pszNeedQuoting++;
+                    cchUnquoted = pszNeedQuoting - pszOrg;
                 }
                 if (cchUnquoted)