Commit 1ff31e13 authored by Alan Modra's avatar Alan Modra
Browse files

PR24337, segfault in _bfd_elf_rela_local_sym

	PR 24337
	* elf.c (_bfd_elf_rela_local_sym): Don't segfault on NULL sec.
	(_bfd_elf_rel_local_sym): Likewise.
parent f55b1e32
2019-03-15 Alan Modra <amodra@gmail.com>
PR 24337
* elf.c (_bfd_elf_rela_local_sym): Don't segfault on NULL sec.
(_bfd_elf_rel_local_sym): Likewise.
2019-03-15 Alan Modra <amodra@gmail.com>
PR 24336
......
......@@ -11822,9 +11822,10 @@ _bfd_elf_rela_local_sym (bfd *abfd,
asection *sec = *psec;
bfd_vma relocation;
relocation = (sec->output_section->vma
+ sec->output_offset
+ sym->st_value);
relocation = sym->st_value;
if (sec == NULL)
return relocation;
relocation += sec->output_section->vma + sec->output_offset;
if ((sec->flags & SEC_MERGE)
&& ELF_ST_TYPE (sym->st_info) == STT_SECTION
&& sec->sec_info_type == SEC_INFO_TYPE_MERGE)
......@@ -11858,7 +11859,7 @@ _bfd_elf_rel_local_sym (bfd *abfd,
{
asection *sec = *psec;
if (sec->sec_info_type != SEC_INFO_TYPE_MERGE)
if (sec == NULL || sec->sec_info_type != SEC_INFO_TYPE_MERGE)
return sym->st_value + addend;
return _bfd_merged_section_offset (abfd, psec,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment