summaryrefslogtreecommitdiff
path: root/sysdeps/i386/backtrace.c
diff options
context:
space:
mode:
authorPaul Pluzhnikov <ppluzhnikov@google.com>2015-08-15 11:42:43 -0700
committerPaul Pluzhnikov <ppluzhnikov@google.com>2015-08-15 11:42:43 -0700
commitd5dff793af80b6534e9fb2e4f0301993bd209a4f (patch)
treec3df534ffb1c966cb96ac71fee5cc0c4f17d3d57 /sysdeps/i386/backtrace.c
parent3cda1b6d56335a101ec3de0053248f68f010eee1 (diff)
Fix BZ #18084 -- backtrace (..., 0) dumps core on x86.
Other architectures also had bugs, or did unnecessary work.
Diffstat (limited to 'sysdeps/i386/backtrace.c')
-rw-r--r--sysdeps/i386/backtrace.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sysdeps/i386/backtrace.c b/sysdeps/i386/backtrace.c
index 550234f577..f10ed566dc 100644
--- a/sysdeps/i386/backtrace.c
+++ b/sysdeps/i386/backtrace.c
@@ -114,6 +114,10 @@ __backtrace (array, size)
int size;
{
struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
+
+ if (size <= 0)
+ return 0;
+
#ifdef SHARED
__libc_once_define (static, once);
@@ -122,8 +126,7 @@ __backtrace (array, size)
return 0;
#endif
- if (size >= 1)
- unwind_backtrace (backtrace_helper, &arg);
+ unwind_backtrace (backtrace_helper, &arg);
if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL)
--arg.cnt;