aboutsummaryrefslogtreecommitdiff
path: root/miscutils/dc.c
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2015-05-25 13:31:25 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2015-05-25 13:31:25 +0200
commitc4603fb09aa2ec06bc8c0ad51b69fe7995a8ea17 (patch)
tree659cdbc8b34b5caa584f3d49738f57cd5f5fd28f /miscutils/dc.c
parentb878121e76730f7f7e458180363371dbe10fd253 (diff)
downloadbusybox-c4603fb09aa2ec06bc8c0ad51b69fe7995a8ea17.tar.gz
busybox-c4603fb09aa2ec06bc8c0ad51b69fe7995a8ea17.tar.bz2
dc: fix "dc p" prinitng bogus data
function old new delta check_under - 20 +20 print_no_pop 27 32 +5 pop 33 24 -9 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/1 up/down: 25/-9) Total: 16 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils/dc.c')
-rw-r--r--miscutils/dc.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/miscutils/dc.c b/miscutils/dc.c
index f94d6fa6b..9c74172ba 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -56,6 +56,12 @@ enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(
} while (0)
+static void check_under(void)
+{
+ if (pointer == 0)
+ bb_error_msg_and_die("stack underflow");
+}
+
static void push(double a)
{
if (pointer >= STACK_SIZE)
@@ -65,8 +71,7 @@ static void push(double a)
static double pop(void)
{
- if (pointer == 0)
- bb_error_msg_and_die("stack underflow");
+ check_under();
return stack[--pointer];
}
@@ -187,6 +192,7 @@ static void print_stack_no_pop(void)
static void print_no_pop(void)
{
+ check_under();
print_base(stack[pointer-1]);
}