Changeset 2770 for trunk/src/kmk/variable.c

Timestamp:

Feb 1, 2015, 6:12:37 PM (10 years ago)

Author:

bird

Message:

string expansion debugged and enabled. fixed access-after-alloc bug in func_sort and could lead to heap corruption.

File:

• trunk/src/kmk/variable.c (modified) (5 diffs)

trunk/src/kmk/variable.c

@@ -386 +386 @@
           v->origin = origin;
           v->recursive = recursive;
-         MAKE_STATS_2(v->changes++);
-#ifdef CONFIG_WITH_COMPILER
-         if (v->evalprog || v->expandprog)
-           kmk_cc_variable_changed (v);
-#endif
+         VARIABLE_CHANGED (v);
         }
       return v;
@@ -603 +599 @@
       if (v->value != 0 && !v->rdonly_val)
           free (v->value);
-      MAKE_STATS_2(v->changes++);
-#ifdef CONFIG_WITH_COMPILER
-      if (v->evalprog || v->expandprog)
-        kmk_cc_variable_changed (v);
-#endif
+      VARIABLE_CHANGED (v);
     }
   else
@@ -764 +756 @@
       var->value_alloc_len = max;
 #endif
+      VARIABLE_CHANGED (var);
 
       /* Remember how many variables are in our current count.  Since we never
@@ -2225 +2218 @@
     memcpy (v->value, value, value_len + 1);
   v->value_length = new_value_len;
+  VARIABLE_CHANGED (v);
 }
 
@@ -2439 +2433 @@
             if (free_value)
                free (free_value);
-            MAKE_STATS_2(v->changes++);
-# ifdef CONFIG_WITH_COMPILER
-            if (v->evalprog || v->expandprog)
-              kmk_cc_variable_changed (v);
-# endif
             return v;
 #else /* !CONFIG_WITH_VALUE_LENGTH */