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

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index e5baeb53506d6ea7717bfdaea8d84e7b89d3b6dc..0405684a9db5bad96ce2daa18ccc6d896b89db17 100644 (file)
--- 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 0c0c8eb62e6e2a79b3a111629465e95a923888c2..fd0ecd777b61d1b3efcb4e696d020339c2ac5051 100644 (file)
--- 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;
     }