emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dc: execute shouldn't pop if stack head is not a string

Browse Source 
This matches the behaviour of both GNU dc (as specified in
its man page), and BSD dc (where stack_popstring() pops
only if the head is a string.)

Add a couple of tests to verify this behavior.

function                                             old     new   delta
zxc_vm_process                                      6882    6884      +2

Signed-off-by: Brian Foley <bpfoley@google.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Brian Foley 2019-09-05 10:46:22 +02:00 committed by Denys Vlasenko
parent 22a6339627
commit 7454879a1d
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
miscutils/bc.c
View File

@ -6521,7 +6521,7 @@ static BC_STATUS zdc_program_execStr(char *code, size_t *bgn, bool cond)
if (s || !BC_PROG_STR(n)) goto exit; if (s || !BC_PROG_STR(n)) goto exit;
sidx = n->rdx; sidx = n->rdx;
} else } else
goto exit; goto exit_nopop;
} }
fidx = sidx + BC_PROG_REQ_FUNCS; fidx = sidx + BC_PROG_REQ_FUNCS;
@ -6561,6 +6561,7 @@ static BC_STATUS zdc_program_execStr(char *code, size_t *bgn, bool cond)
RETURN_STATUS(BC_STATUS_SUCCESS); RETURN_STATUS(BC_STATUS_SUCCESS);
exit: exit:
bc_vec_pop(&G.prog.results); bc_vec_pop(&G.prog.results);
exit_nopop:
RETURN_STATUS(s); RETURN_STATUS(s);
} }
#define zdc_program_execStr(...) (zdc_program_execStr(__VA_ARGS__) COMMA_SUCCESS) #define zdc_program_execStr(...) (zdc_program_execStr(__VA_ARGS__) COMMA_SUCCESS)

10
testsuite/dc.tests
View File

@ -44,6 +44,16 @@ testing "dc complex without spaces (multiple args)" \
optional FEATURE_DC_BIG optional FEATURE_DC_BIG
# All tests below depend on FEATURE_DC_BIG # All tests below depend on FEATURE_DC_BIG
testing "dc: x should execute strings" \
"dc -e'[40 2 +] x f'" \
"42\n" \
"" ""
testing "dc: x should not execute or pop non-strings" \
"dc -e'42 x f'" \
"42\n" \
"" ""
testing "dc read" \ testing "dc read" \
"dc -finput" \ "dc -finput" \
"2\n9\n1\n" \ "2\n9\n1\n" \