libbacktrace/

chefmax · chefmax · commit 047a1c2fd2a3 · 2016-03-02T16:32:55.000Z
2016-03-02  Maxim Ostapenko  &lt;m.ostapenko@partner.samsung.com&gt;

	* elf.c (backtrace_initialize): Properly initialize elf_fileline_fn to
	avoid possible crash.
	(elf_add): Don't set *fileline_fn to elf_nodebug value in case of
	missing debug info anymore.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233911 138bc75d-0d04-0410-961f-82ee72b054a4
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
@@ -1,3 +1,10 @@
+2016-03-02  Maxim Ostapenko  <m.ostapenko@partner.samsung.com>
+
+	* elf.c (backtrace_initialize): Properly initialize elf_fileline_fn to
+	avoid possible crash.
+	(elf_add): Don't set *fileline_fn to elf_nodebug value in case of
+	missing debug info anymore.
+
 2016-02-06  John David Anglin  <danglin@gcc.gnu.org>
 
 	* mmap.c (MAP_FAILED): Define if not defined.
diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c
@@ -791,7 +791,6 @@ elf_add (struct backtrace_state *state, int descriptor, uintptr_t base_address,
     {
       if (!backtrace_close (descriptor, error_callback, data))
 	goto fail;
-      *fileline_fn = elf_nodebug;
       return 1;
     }
 
@@ -925,7 +924,7 @@ backtrace_initialize (struct backtrace_state *state, int descriptor,
   int ret;
   int found_sym;
   int found_dwarf;
-  fileline elf_fileline_fn;
+  fileline elf_fileline_fn = elf_nodebug;
   struct phdr_data pd;
 
   ret = elf_add (state, descriptor, 0, error_callback, data, &elf_fileline_fn,

Original file line number	Diff line number	Diff line change
`@@ -791,7 +791,6 @@ elf_add (struct backtrace_state *state, int descriptor, uintptr_t base_address,`
`791`	`791`	`{`
`792`	`792`	`if (!backtrace_close (descriptor, error_callback, data))`
`793`	`793`	`goto fail;`
`794`		`- *fileline_fn = elf_nodebug;`
`795`	`794`	`return 1;`
`796`	`795`	`}`
`797`	`796`
`@@ -925,7 +924,7 @@ backtrace_initialize (struct backtrace_state *state, int descriptor,`
`925`	`924`	`int ret;`
`926`	`925`	`int found_sym;`
`927`	`926`	`int found_dwarf;`
`928`		`- fileline elf_fileline_fn;`
	`927`	`+ fileline elf_fileline_fn = elf_nodebug;`
`929`	`928`	`struct phdr_data pd;`
`930`	`929`
`931`	`930`	`ret = elf_add (state, descriptor, 0, error_callback, data, &elf_fileline_fn,`