Changeset 910 for trunk/src/gmakenew/remake.c

Timestamp:

May 24, 2007, 5:10:51 AM (18 years ago)

Author:

bird

Message:

Fixed a few potential variable_buffer realloc problems.

File:

• trunk/src/gmakenew/remake.c (modified) (3 diffs)

trunk/src/gmakenew/remake.c

@@ -809 +809 @@
 #ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
   /* update not_parallel if the file was flagged for that. */
-  if (   ran 
-      && (file->command_flags & (COMMANDS_NOTPARALLEL | COMMANDS_NO_COMMANDS)) 
+  if (   ran
+      && (file->command_flags & (COMMANDS_NOTPARALLEL | COMMANDS_NO_COMMANDS))
          == COMMANDS_NOTPARALLEL)
     {
@@ -1503 +1503 @@
       static int libdir_maxlen = -1;
       char *libbuf = variable_expand ("");
+      const size_t libbuf_offset = libbuf - variable_buffer; /* bird */
 
       /* Expand the pattern using LIBNAME as a replacement.  */
@@ -1525 +1526 @@
         p4 = variable_buffer_output (p4, p3+1, len - (p3-p));
         p[len] = c;
+        libbuf = variable_buffer + libbuf_offset; /* bird - variable_buffer may have been reallocated. */
       }