Changeset 1452 in kBuild

Timestamp:

Mar 30, 2008 2:06:32 PM (17 years ago)

Author:

bird

Message:

Fixed bug in $(commands ) that caused occational heap corruption.

File:

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

trunk/src/kmk/function.c

@@ -1559 +1559 @@
       o = variable_buffer_output (o, v->value, v->value_length + 1);
       o = variable_buffer + off;
+      assert (!o[v->value_length]);
 
       /* Eval the value.  Pop the current variable buffer setting so that the
@@ -1564 +1565 @@
 
       install_variable_buffer (&buf, &len);
-      var_ctx = !strcmp(funcname, "evalvalctx");
+      var_ctx = !strcmp (funcname, "evalvalctx");
       if (var_ctx)
         push_new_variable_scope ();
@@ -3783 +3784 @@
           if (*o != '\0' && *o != '%')
             o = strchr (o, '\0');
+          else if (i)
+            o = p - cmd_sep_len;
           else
-            o = p - cmd_sep_len;
+            o = p;
         }
     }