diff options
| author | Ian Lance Taylor <iant@google.com> | 2012-09-27 19:20:49 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-09-27 19:20:49 +0000 |
| commit | 588f4f8fc148d4da5107f72409c65192431a411c (patch) | |
| tree | 5e3c79a208419b4d6a25dfda13b06c772936682d | |
| parent | 2f13f2de1f2a4da8da6015b18479a41d3e67eff2 (diff) | |
| download | gcc-588f4f8fc148d4da5107f72409c65192431a411c.zip gcc-588f4f8fc148d4da5107f72409c65192431a411c.tar.gz gcc-588f4f8fc148d4da5107f72409c65192431a411c.tar.bz2 | |
re PR other/54726 (libbacktrace segfaults on gcc_asserts with stripped gcc)
PR other/54726
* elf.c (backtrace_initialize): Set *fileln_fn, not
state->fileln_fn.
From-SVN: r191811
| -rw-r--r-- | libbacktrace/ChangeLog | 6 | ||||
| -rw-r--r-- | libbacktrace/elf.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index e5baeb5..0405684 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,9 @@ +2012-09-27 Ian Lance Taylor <iant@google.com> + + PR other/54726 + * elf.c (backtrace_initialize): Set *fileln_fn, not + state->fileln_fn. + 2012-09-19 Ian Lance Taylor <iant@google.com> * configure.ac: Only use GCC_CHECK_UNWIND_GETIPINFO when compiled diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c index 0c0c8eb..fd0ecd7 100644 --- a/libbacktrace/elf.c +++ b/libbacktrace/elf.c @@ -634,7 +634,7 @@ backtrace_initialize (struct backtrace_state *state, int descriptor, { if (!backtrace_close (descriptor, error_callback, data)) goto fail; - state->fileline_fn = elf_nodebug; + *fileline_fn = elf_nodebug; state->fileline_data = NULL; return 1; } |