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>
This commit is contained in:
parent
7454879a1d
commit
b64470be17
@ -4973,7 +4973,9 @@ static void dc_parse_string(void)
|
|||||||
xc_parse_pushInst_and_Index(XC_INST_STR, len);
|
xc_parse_pushInst_and_Index(XC_INST_STR, len);
|
||||||
bc_vec_push(&G.prog.strs, &str);
|
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();
|
xc_program_add_fn();
|
||||||
p->func = xc_program_func(p->fidx);
|
p->func = xc_program_func(p->fidx);
|
||||||
|
|
||||||
@ -6398,7 +6400,11 @@ static BC_STATUS zdc_program_asciify(void)
|
|||||||
str = xzalloc(2);
|
str = xzalloc(2);
|
||||||
str[0] = c;
|
str[0] = c;
|
||||||
//str[1] = '\0'; - already is
|
//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:
|
dup:
|
||||||
res.t = XC_RESULT_STR;
|
res.t = XC_RESULT_STR;
|
||||||
res.d.id.idx = idx;
|
res.d.id.idx = idx;
|
||||||
|
@ -54,6 +54,11 @@ testing "dc: x should not execute or pop non-strings" \
|
|||||||
"42\n" \
|
"42\n" \
|
||||||
"" ""
|
"" ""
|
||||||
|
|
||||||
|
testing "dc: x should work with strings created from a" \
|
||||||
|
"dc -e'42 112 a x'" \
|
||||||
|
"42\n" \
|
||||||
|
"" ""
|
||||||
|
|
||||||
testing "dc read" \
|
testing "dc read" \
|
||||||
"dc -finput" \
|
"dc -finput" \
|
||||||
"2\n9\n1\n" \
|
"2\n9\n1\n" \
|
||||||
|
Loading…
Reference in New Issue
Block a user