Changeset 1445 for trunk/src/kmk

Timestamp:

Mar 30, 2008, 9:47:08 AM (17 years ago)

Author:

bird

Message:

Fixed evalval and evalcall - eval_buffer will change the input, so a copy of the variable is necessary.

File:

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

trunk/src/kmk/function.c

@@ -1548 +1548 @@
   if (v)
     {
+      char *tmp;
       char *buf;
       unsigned int len;
@@ -1560 +1561 @@
         push_new_variable_scope ();
 
-      eval_buffer (v->value);
+      tmp = xmalloc (v->value_length + 1);
+      memcpy (tmp, v->value, v->value_length + 1);
+      eval_buffer (tmp);
+      free (tmp);
 
       if (var_ctx)
@@ -3844 +3848 @@
 #ifdef CONFIG_WITH_EVALPLUS
   { STRING_SIZE_TUPLE("evalctx"),       0,  1,  1,  func_evalctx},
-  { STRING_SIZE_TUPLE("evalval"),       0,  1,  0,  func_evalval},
-  { STRING_SIZE_TUPLE("evalvalctx"),    0,  1,  0,  func_evalval},
+  { STRING_SIZE_TUPLE("evalval"),       1,  1,  1,  func_evalval},
+  { STRING_SIZE_TUPLE("evalvalctx"),    1,  1,  1,  func_evalval},
   { STRING_SIZE_TUPLE("evalcall"),      1,  0,  1,  func_call},
   { STRING_SIZE_TUPLE("evalcall2"),     1,  0,  1,  func_call},
@@ -3908 +3912 @@
 #endif
 #ifdef CONFIG_WITH_MAKE_STATS
-  { STRING_SIZE_TUPLE("make-stats"),    0, ~0,  0,  func_make_stats},
+  { STRING_SIZE_TUPLE("make-stats"),    0,  0,  0,  func_make_stats},
 #endif
 #ifdef CONFIG_WITH_COMMANDS_FUNC
@@ -4187 +4191 @@
     {
       /* Evaluate the variable value directly without expanding it first.  */
+      char *tmp;
 
       install_variable_buffer (&buf, &len);
-      eval_buffer (v->value);
+
+      tmp = xmalloc (v->value_length + 1);
+      memcpy (tmp, v->value, v->value_length + 1);
+      eval_buffer (tmp);
+      free (tmp);
+
       restore_variable_buffer (buf, len);
     }