diff options
author | Ian Lance Taylor <iant@google.com> | 2015-09-08 16:46:16 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-09-08 16:46:16 +0000 |
commit | c478516be7517e20e150150fea4399d60434bfc3 (patch) | |
tree | eae6d20512a5643294e17bfb41e704ab2559be16 /libbacktrace/backtrace.c | |
parent | 2eab96661b6c08679ffd4a084f59f3935cfcddb9 (diff) |
re PR other/67457 (segfault in libbacktrace)
PR other/67457
* backtrace.c: #include "internal.h".
(struct backtrace_data): Add can_alloc field.
(unwind): If can_alloc is false, don't try to get file/line
information.
(backtrace_full): Set can_alloc field in bdata.
* alloc.c (backtrace_alloc): Don't call error_callback if it is
NULL.
* mmap.c (backtrace_alloc): Likewise.
* internal.h: Update comments for backtrace_alloc and
backtrace_free.
From-SVN: r227533
Diffstat (limited to 'libbacktrace/backtrace.c')
-rw-r--r-- | libbacktrace/backtrace.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/libbacktrace/backtrace.c b/libbacktrace/backtrace.c index d352d27a400..d675e1e1062 100644 --- a/libbacktrace/backtrace.c +++ b/libbacktrace/backtrace.c @@ -34,6 +34,7 @@ POSSIBILITY OF SUCH DAMAGE. */ #include "unwind.h" #include "backtrace.h" +#include "internal.h" /* The main backtrace_full routine. */ @@ -53,6 +54,8 @@ struct backtrace_data void *data; /* Value to return from backtrace_full. */ int ret; + /* Whether there is any memory available. */ + int can_alloc; }; /* Unwind library callback routine. This is passed to @@ -80,8 +83,11 @@ unwind (struct _Unwind_Context *context, void *vdata) if (!ip_before_insn) --pc; - bdata->ret = backtrace_pcinfo (bdata->state, pc, bdata->callback, - bdata->error_callback, bdata->data); + if (!bdata->can_alloc) + bdata->ret = bdata->callback (bdata->data, pc, NULL, 0, NULL); + else + bdata->ret = backtrace_pcinfo (bdata->state, pc, bdata->callback, + bdata->error_callback, bdata->data); if (bdata->ret != 0) return _URC_END_OF_STACK; @@ -96,6 +102,7 @@ backtrace_full (struct backtrace_state *state, int skip, backtrace_error_callback error_callback, void *data) { struct backtrace_data bdata; + void *p; bdata.skip = skip + 1; bdata.state = state; @@ -103,6 +110,18 @@ backtrace_full (struct backtrace_state *state, int skip, bdata.error_callback = error_callback; bdata.data = data; bdata.ret = 0; + + /* If we can't allocate any memory at all, don't try to produce + file/line information. */ + p = backtrace_alloc (state, 4096, NULL, NULL); + if (p == NULL) + bdata.can_alloc = 0; + else + { + backtrace_free (state, p, 4096, NULL, NULL); + bdata.can_alloc = 1; + } + _Unwind_Backtrace (unwind, &bdata); return bdata.ret; } |