Fix bug #2238: the read.c:eval() function was not entirely reentrant.

Apply patch #1022: fix a memory corruption on very long target-specific
variable definition lines.

2 files changed, 21 insertions, 4 deletions

diff --git a/tests/scripts/functions/call b/tests/scripts/functions/call
index efee476..f3c5470 100644
--- a/tests/scripts/functions/call
+++ b/tests/scripts/functions/call
@@ -66,7 +66,6 @@ close(MAKEFILE);
 
 &run_make_with_options($makefile, "", &get_logfile);
 $answer = "foo bar\ndefault file file\nb d f\n\n\nb\nbar foo baz\nfoo bar baz blarp quux \n";
-
 &compare_output($answer, &get_logfile(1));
 
 
@@ -94,10 +93,7 @@ EOF
 close(MAKEFILE);
 
 &run_make_with_options($makefile2, "", &get_logfile);
-
-# Create the answer to what should be produced by this Makefile
 $answer = "1 2 3 4 5 6 7 8 9\n1 2 3 4 5\n1 2 3\n1 2 3\n";
-
 &compare_output($answer,&get_logfile(1));
 
 1;
diff --git a/tests/scripts/functions/eval b/tests/scripts/functions/eval
index 174767d..cfb27b2 100644
--- a/tests/scripts/functions/eval
+++ b/tests/scripts/functions/eval
@@ -88,4 +88,25 @@ $answer = "it\n";
 $answer = "it\nworked\n";
 &compare_output($answer,&get_logfile(1));
 
+
+# TEST very recursive invocation of eval
+
+$makefile3 = &get_tmpfile;
+
+open(MAKEFILE,"> $makefile3");
+
+print MAKEFILE <<'EOF';
+..9 := 0 1 2 3 4 5 6 7 8 9
+rev=$(eval res:=)$(foreach word,$1,$(eval res:=${word} ${res}))${res}
+a:=$(call rev,${..9})
+all: ; @echo '[$(a)]'
+
+EOF
+
+close(MAKEFILE);
+
+&run_make_with_options($makefile3, "", &get_logfile);
+$answer = "[         9 8 7 6 5 4 3 2 1 0 ]\n";
+&compare_output($answer,&get_logfile(1));
+
 1;