OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix seg-fault attempting to strip a corrupt binary.

Browse Source 
PR binutils/20922
	* elf.c (find_link): Check for null headers before attempting to
	match them.
This commit is contained in:
Nick Clifton 2016-12-05 13:35:50 +00:00
parent 88add6d8e7
commit a55c9876bb
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bfd/ChangeLog
View File

@ -1,5 +1,9 @@
2016-12-05 Nick Clifton <nickc@redhat.com>
PR binutils/20922
* elf.c (find_link): Check for null headers before attempting to
match them.
PR ld/20925
* aoutx.h (aout_link_add_symbols): Replace BFD_ASSERT with return
FALSE.

8
bfd/elf.c
View File

@ -1271,13 +1271,19 @@ find_link (const bfd * obfd, const Elf_Internal_Shdr * iheader, const unsigned i
Elf_Internal_Shdr ** oheaders = elf_elfsections (obfd);
unsigned int i;
if (section_match (oheaders[hint], iheader))
BFD_ASSERT (iheader != NULL);
/* See PR 20922 for a reproducer of the NULL test. */
if (oheaders[hint] != NULL
&& section_match (oheaders[hint], iheader))
return hint;
for (i = 1; i < elf_numsections (obfd); i++)
{
Elf_Internal_Shdr * oheader = oheaders[i];
if (oheader == NULL)
continue;
if (section_match (oheader, iheader))
/* FIXME: Do we care if there is a potential for
multiple matches ? */