From d5dff793af80b6534e9fb2e4f0301993bd209a4f Mon Sep 17 00:00:00 2001 From: Paul Pluzhnikov Date: Sat, 15 Aug 2015 11:42:43 -0700 Subject: Fix BZ #18084 -- backtrace (..., 0) dumps core on x86. Other architectures also had bugs, or did unnecessary work. --- sysdeps/s390/s390-32/backtrace.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sysdeps/s390/s390-32') diff --git a/sysdeps/s390/s390-32/backtrace.c b/sysdeps/s390/s390-32/backtrace.c index 73db65275d..4e5e1feee6 100644 --- a/sysdeps/s390/s390-32/backtrace.c +++ b/sysdeps/s390/s390-32/backtrace.c @@ -126,6 +126,10 @@ int __backtrace (void **array, int size) { struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; + + if (size <= 0) + return 0; + #ifdef SHARED __libc_once_define (static, once); @@ -135,8 +139,7 @@ __backtrace (void **array, int size) return __backchain_backtrace (array, size); #endif - if (size >= 1) - unwind_backtrace (backtrace_helper, &arg); + unwind_backtrace (backtrace_helper, &arg); return arg.cnt != -1 ? arg.cnt : 0; } -- cgit 1.4.1