aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Brian Foley <bpfoley@google.com>2019-09-05 10:50:13 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2019-10-21 16:54:40 +0200
commit50ba92128b0a6472a3a85efaaa8ce3bfbda1bce5 (patch)
tree23c1ee796fac16978671f29dfb0e12f3039c61e6
parent4699b932446f809d747d97f8e24b5d48608f7276 (diff)
downloadbusybox-50ba92128b0a6472a3a85efaaa8ce3bfbda1bce5.tar.gz
busybox-50ba92128b0a6472a3a85efaaa8ce3bfbda1bce5.tar.bz2
dc: Fix segfault when executing strings generated using asciify
function old new delta zxc_vm_process 6884 6891 +7 Signed-off-by: Brian Foley <bpfoley@google.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--miscutils/bc.c10
-rwxr-xr-xtestsuite/dc.tests5
2 files changed, 13 insertions, 2 deletions
diff --git a/miscutils/bc.c b/miscutils/bc.c
index 9a9880706..44c70cac3 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -4973,7 +4973,9 @@ static void dc_parse_string(void)
xc_parse_pushInst_and_Index(XC_INST_STR, len);
bc_vec_push(&G.prog.strs, &str);
- // Explanation needed here
+ // Add an empty function so that if zdc_program_execStr ever needs to
+ // parse the string into code (from the 'x' command) there's somewhere
+ // to store the bytecode.
xc_program_add_fn();
p->func = xc_program_func(p->fidx);
@@ -6398,7 +6400,11 @@ static BC_STATUS zdc_program_asciify(void)
str = xzalloc(2);
str[0] = c;
//str[1] = '\0'; - already is
- bc_vec_push(&G.prog.strs, &str);
+ idx = bc_vec_push(&G.prog.strs, &str);
+ // Add an empty function so that if zdc_program_execStr ever needs to
+ // parse the string into code (from the 'x' command) there's somewhere
+ // to store the bytecode.
+ xc_program_add_fn();
dup:
res.t = XC_RESULT_STR;
res.d.id.idx = idx;
diff --git a/testsuite/dc.tests b/testsuite/dc.tests
index f74e3f0f5..1fc13c201 100755
--- a/testsuite/dc.tests
+++ b/testsuite/dc.tests
@@ -54,6 +54,11 @@ testing "dc: x should not execute or pop non-strings" \
"42\n" \
"" ""
+testing "dc: x should work with strings created from a" \
+ "dc -e'42 112 a x'" \
+ "42\n" \
+ "" ""
+
testing "dc read" \
"dc -finput" \
"2\n9\n1\n" \