Changeset 2634 in kBuild for trunk/src

Timestamp:

Sep 8, 2012 11:50:05 PM (12 years ago)

Author:

bird

Message:

kmk/file.c: Fixed double free when CONFIG_WITH_STRCACHE2 is defined. Fixed 2nd expansion bug when CONFIG_WITH_INCLUDEDEP is defined. Fixed GNU make memory leak during 2nd expansion.

File:

• trunk/src/kmk/file.c (modified) (3 diffs)

trunk/src/kmk/file.c

@@ -673 +673 @@
 #ifdef CONFIG_WITH_INCLUDEDEP
       /* Dependencies loaded by includedep are ready for use and we skip
-         the expensive parsing and globbing for them. To avoid wasting
-         lots of time walking the f->deps chain, we will advance D and
-         process all subsequent includedep records. */
+         the expensive parsing and globbing for them.  */
 
       if (d->includedep)
         {
-          struct dep *d1 = new = alloc_dep();
-          d1->staticpattern = 0;
-          d1->need_2nd_expansion = 0;
-          d1->includedep = 1;
-          d1->file = lookup_file (d->name);
-          if (d1->file == 0)
-            d1->file = enter_file (d->name);
-
-          while (d->next && d->next->includedep)
-            {
-              d = d->next;
-              d1 = d1->next = alloc_dep();
-              d1->staticpattern = 0;
-              d1->need_2nd_expansion = 0;
-              d1->includedep = 1;
-              d1->file = lookup_file (d->name);
-              if (d1->file == 0)
-                d1->file = enter_file (d->name);
-            }
+          d->need_2nd_expansion = 0;
+          d->file = lookup_file (name);
+          if (d->file == 0)
+            d->file = enter_file (name);
+          d->name = 0;
+          free(name);
+
+          dp = &d->next;
+          d = d->next;
+          continue;
         }
-      else
-      {
 #endif /* CONFIG_WITH_INCLUDEDEP */
 
@@ -711 +698 @@
           o = subst_expand (o, name, "%", "$*", 1, 2, 0);
           *o = '\0';
+#ifndef CONFIG_WITH_STRCACHE2
           free (name);
-#ifndef CONFIG_WITH_STRCACHE2
           d->name = name = xstrdup (variable_buffer); /* bird not d->name, can be reallocated */
 #else
@@ -758 +745 @@
         }
 
-#ifdef CONFIG_WITH_INCLUDEDEP
-      }
-#endif
-
       /* Add newly parsed prerequisites.  */
       next = d->next;
+#ifdef KMK /* bird: memory leak */
+      assert(new != d);
+      free_dep (d);
+#endif
       *dp = new;
       for (dp = &new->next, d = new->next; d != 0; dp = &d->next, d = d->next)