Changeset 910 in kBuild for trunk

Timestamp:

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

Author:

bird

Message:

Fixed a few potential variable_buffer realloc problems.

Location:

trunk/src/gmakenew

Files:

• file.c (modified) (5 diffs)
• read.c (modified) (1 diff)
• remake.c (modified) (3 diffs)

trunk/src/gmakenew/file.c

@@ -474 +474 @@
   for (d = old; d != 0; d = d->next)
     {
+      size_t buffer_offset; /* bird */
       struct dep *new, *d1;
       char *p;
@@ -485 +486 @@
       if (! d->need_2nd_expansion)
         {
-          size_t l;                         /* bird */
           p = variable_expand ("");
-          l = p - variable_buffer;          /* bird */
+          buffer_offset = p - variable_buffer;
           variable_buffer_output (p, d->name, strlen (d->name) + 1);
-          p = variable_buffer + l;          /* bird - this may have been reallocated! */
+          p = variable_buffer + buffer_offset; /* bird - variable_buffer may have been reallocated. (observed it) */
         }
       else
@@ -499 +499 @@
               char *o;
               char *buffer = variable_expand ("");
+              buffer_offset = buffer - variable_buffer; /* bird */
 
               o = subst_expand (buffer, d->name, "%", "$*", 1, 2, 0);
+              buffer = variable_buffer + buffer_offset; /* bird - variable_buffer may have been reallocated. */
 
               d->name = strcache_add_len (buffer, o - buffer);
@@ -538 +540 @@
           const char *pattern = "%";
           char *buffer = variable_expand ("");
+          const size_t buffer_offset = buffer - variable_buffer; /* bird */
           struct dep *dp = new, *dl = 0;
 
@@ -562 +565 @@
                     o = patsubst_expand_pat (buffer, d->stem, pattern, nm,
                                              pattern+1, percent+1);
+                  buffer = variable_buffer + buffer_offset; /* bird - variable_buffer may have been reallocated. */
+
 
                   /* If the name expanded to the empty string, ignore it.  */

trunk/src/gmakenew/read.c

@@ -2186 +2186 @@
           static const char *percent = "%";
           char *buffer = variable_expand ("");
+          const size_t buffer_offset = buffer - variable_buffer; /* bird */
           char *o = patsubst_expand_pat (buffer, name, pattern, percent,
                                          pattern_percent+1, percent+1);
+          buffer = variable_buffer + buffer_offset; /* bird - variable_buffer may have been reallocated. */
           f->stem = strcache_add_len (buffer, o - buffer);
           if (this)

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. */
       }