summaryrefslogtreecommitdiff
path: root/libbacktrace
diff options
context:
space:
mode:
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/ChangeLog6
-rw-r--r--libbacktrace/elf.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index e5baeb53506..0405684a9db 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 0c0c8eb62e6..fd0ecd777b6 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;
}