Changeset 1838 in kBuild for trunk/src/kmk

Timestamp:

Oct 11, 2008 7:34:24 PM (16 years ago)

Author:

bird

Message:

kmk: fixed string termination for three strcache_add_len calls. (it will copy the string to the stack if it's not terminated.)

Location:

trunk/src/kmk

Files:

• function.c (modified) (1 diff)
• read.c (modified) (2 diffs)

trunk/src/kmk/function.c

@@ -289 +289 @@
         }
     }
+#ifndef CONFIG_WITH_VALUE_LENGTH
   if (doneany)
     /* Kill the last space.  */
     --o;
+#else
+  /* Kill the last space and make sure there is a terminator there
+     so that strcache_add_len doesn't have to do a lot of exacty work
+     when expand_deps sends the output its way. */
+  if (doneany)
+    *--o = '\0';
+  else
+    o = variable_buffer_output (o, "\0", 1) - 1;
+#endif
 
   return o;

trunk/src/kmk/read.c

@@ -1426 +1426 @@
             /* Put all the prerequisites here; they'll be parsed later.  */
             deps = alloc_dep ();
+#ifndef CONFIG_WITH_VALUE_LENGTH
             deps->name = strcache_add_len (beg, end - beg + 1);
+#else  /* CONFIG_WITH_VALUE_LENGTH */
+            {
+              /* Make sure the strcache_add_len input is terminated so it
+                 doesn't have to make a temporary copy on the stack. */
+              char saved = end[1];
+              ((char *)end)[1] = '\0';
+            deps->name = strcache_add_len (beg, end - beg + 1);
+              ((char *)end)[1] = saved;
+            }
+#endif /* CONFIG_WITH_VALUE_LENGTH */
           }
         else
@@ -2978 +2989 @@
           free (qbase);
         }
-#else
+#elif !defined(CONFIG_WITH_VALUE_LENGTH)
         name = strcache_add_len (q, p - q);
-#endif
+#else  /* CONFIG_WITH_VALUE_LENGTH */
+       {
+         /* Make sure it's terminated, strcache_add_len has to make a
+            temp copy on the stack otherwise. */
+         char saved = *p;
+         *p = '\0';
+         name = strcache_add_len (q, p - q);
+         *p = saved;
+       }
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 
       /* Add it to the front of the chain.  */