aboutsummaryrefslogtreecommitdiff
path: root/miscutils/bc.c
diff options
context:
space:
mode:
authorBrian Foley <bpfoley@google.com>2019-09-05 10:46:22 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2019-09-05 10:46:22 +0200
commit7454879a1d9e3948a9af21e31e9d59d5ae8b89f2 (patch)
treebf127bd4540a12f52ff6af0a0260b7a1f3222149 /miscutils/bc.c
parent22a633962786a7bc97870ced913fc237143cfd68 (diff)
downloadbusybox-w32-7454879a1d9e3948a9af21e31e9d59d5ae8b89f2.tar.gz
busybox-w32-7454879a1d9e3948a9af21e31e9d59d5ae8b89f2.tar.bz2
busybox-w32-7454879a1d9e3948a9af21e31e9d59d5ae8b89f2.zip
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 <bpfoley@google.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils/bc.c')
-rw-r--r--miscutils/bc.c3
1 files changed, 2 insertions, 1 deletions
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)
6521 if (s || !BC_PROG_STR(n)) goto exit; 6521 if (s || !BC_PROG_STR(n)) goto exit;
6522 sidx = n->rdx; 6522 sidx = n->rdx;
6523 } else 6523 } else
6524 goto exit; 6524 goto exit_nopop;
6525 } 6525 }
6526 6526
6527 fidx = sidx + BC_PROG_REQ_FUNCS; 6527 fidx = sidx + BC_PROG_REQ_FUNCS;
@@ -6561,6 +6561,7 @@ static BC_STATUS zdc_program_execStr(char *code, size_t *bgn, bool cond)
6561 RETURN_STATUS(BC_STATUS_SUCCESS); 6561 RETURN_STATUS(BC_STATUS_SUCCESS);
6562 exit: 6562 exit:
6563 bc_vec_pop(&G.prog.results); 6563 bc_vec_pop(&G.prog.results);
6564 exit_nopop:
6564 RETURN_STATUS(s); 6565 RETURN_STATUS(s);
6565} 6566}
6566#define zdc_program_execStr(...) (zdc_program_execStr(__VA_ARGS__) COMMA_SUCCESS) 6567#define zdc_program_execStr(...) (zdc_program_execStr(__VA_ARGS__) COMMA_SUCCESS)