Changeset 2327

Timestamp:

Apr 10, 2009, 6:19:39 PM (17 years ago)

Author:

bird

Message:

Backported 2276: kmk: Do not crash if is missing the 3rd argument, it is supposed to be optional... References #85

Location:

branches/kBuild-0.1.5

Files:

• . (modified) (1 prop)
• src/kmk/function.c (modified) (1 diff)

branches/kBuild-0.1.5/src/kmk/function.c

@@ -4228 +4228 @@
 
   /* Evaluate the condition in argv[0] and expand the 2nd or
-     3rd argument according to the result. */
+     3rd (optional) argument according to the result. */
   rc = expr_eval_if_conditionals (argv[0], NULL);
   to_expand = rc == 0 ? argv[1] : argv[2];
-  if (*to_expand)
+  if (to_expand && *to_expand)
     variable_expand_string_2 (o, to_expand, -1, &o);