Changeset 1484 in kBuild

Timestamp:

Apr 3, 2008 10:04:54 PM (17 years ago)

Author:

bird

Message:

Fixed memchr crash in kbuild_get_object_base. A recent regression caused by the '..' -> 'dt' change.

File:

• trunk/src/kmk/kbuild.c (modified) (1 diff)

trunk/src/kmk/kbuild.c

@@ -940 +940 @@
 
     /* convert '..' path elements in the source to 'dt'. */
-    psz = pszDot;
-    while ((psz = memchr(psz, '.', cchSrc + 1 - (pszDot - psz))) != NULL)
-    {
-        if (    psz[1] == '.'
-            &&  (   psz == pszDot
-                 || psz[-1] == '/'
+    while ((pszDot = memchr(pszDot, '.', psz - pszDot)) != NULL)
+    {
+        if (    pszDot[1] == '.'
+            &&  (   pszDot == psz
+                 || pszDot[-1] == '/'
 #ifdef HAVE_DOS_PATHS
-                 || psz[-1] == '\\'
-                 || psz[-1] == ':'
+                 || pszDot[-1] == '\\'
+                 || pszDot[-1] == ':'
 #endif
                 )
-            &&  (   !psz[2]
-                 || psz[2] == '/'
+            &&  (   !pszDot[2]
+                 || pszDot[2] == '/'
 #ifdef HAVE_DOS_PATHS
-                 || psz[2] == '\\'
-                 || psz[2] == ':'
+                 || pszDot[2] == '\\'
+                 || pszDot[2] == ':'
 #endif
                 )
             )
         {
-            *psz++ = 'd';
-            *psz++ = 't';
+            *pszDot++ = 'd';
+            *pszDot++ = 't';
         }
         else
-            psz++;
+            pszDot++;
     }