Changeset 1396 in kBuild

Timestamp:

Mar 16, 2008 6:19:12 PM (17 years ago)

Author:

bird

Message:

Don't allow '..' elements in the objbase, convert them to '_.'.

File:

• trunk/src/kmk/kbuild.c (modified) (4 diffs)

trunk/src/kmk/kbuild.c

@@ -843 +843 @@
     const char *pszSrcPrefix = NULL;
     size_t      cchSrcPrefix = 0;
+    size_t      cchSrc = 0;
     const char *pszSrcEnd;
     char *pszSrc;
     char *pszResult;
     char *psz;
+    char *pszDot;
     size_t cch;
 
@@ -911 +913 @@
 
     /*
-     * Assemble the string on the stack and define the objbase variable
+     * Assemble the string on the heap and define the objbase variable
      * which we then return.
      */
+    cchSrc = pszSrcEnd - pszSrc;
     cch = pPathTarget->value_length
         + 1 /* slash */
@@ -919 +922 @@
         + 1 /* slash */
         + cchSrcPrefix
-        + pszSrcEnd - pszSrc
+        + cchSrc
         + 1;
     psz = pszResult = xmalloc(cch);
@@ -932 +935 @@
         psz += cchSrcPrefix;
     }
-    memcpy(psz, pszSrc, pszSrcEnd - pszSrc); psz += pszSrcEnd - pszSrc;
+    pszDot = psz;
+    memcpy(psz, pszSrc, cchSrc); psz += cchSrc;
     *psz = '\0';
+
+    /* convert '..' path elements in the source to '_.'. */
+    psz = pszDot;
+    while ((psz = memchr(psz, '.', cchSrc + 1 - (pszDot - psz))) != NULL)
+    {
+        if (    psz[1] == '.'
+            &&  (   psz == pszDot
+                 || psz[-1] == '/'
+#ifdef HAVE_DOS_PATHS
+                 || psz[-1] == '\\'
+                 || psz[-1] == ':'
+#endif
+                )
+            &&  (   !psz[2]
+                 || psz[2] == '/'
+#ifdef HAVE_DOS_PATHS
+                 || psz[2] == '\\'
+                 || psz[2] == ':'
+#endif
+                )
+            )
+        {
+            *psz = '_';
+            psz += 2;
+        }
+        else
+            psz++;
+    }
 
     /*