Skip to content

Commit

Permalink
libbacktrace/
Browse files Browse the repository at this point in the history
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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233911 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
chefmax committed Mar 2, 2016
1 parent 901faaa commit 047a1c2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 7 additions & 0 deletions libbacktrace/ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 1 addition & 2 deletions libbacktrace/elf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 047a1c2

Please sign in to comment.