From 7454879a1d9e3948a9af21e31e9d59d5ae8b89f2 Mon Sep 17 00:00:00 2001 From: Brian Foley Date: Thu, 5 Sep 2019 10:46:22 +0200 Subject: dc: execute shouldn't pop if stack head is not a string 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 Signed-off-by: Denys Vlasenko --- miscutils/bc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'miscutils/bc.c') diff --git a/miscutils/bc.c b/miscutils/bc.c index 7ac30dd53..4a3ae49c5 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c @@ -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; sidx = n->rdx; } else - goto exit; + goto exit_nopop; } 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); exit: bc_vec_pop(&G.prog.results); + exit_nopop: RETURN_STATUS(s); } #define zdc_program_execStr(...) (zdc_program_execStr(__VA_ARGS__) COMMA_SUCCESS) -- cgit v1.2.3