From 1ff31e135f04b2773e10d3e5072776c1072edbfb Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 15 Mar 2019 16:49:42 +1030 Subject: [PATCH] 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. --- bfd/ChangeLog | 6 ++++++ bfd/elf.c | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b1011b1eb6..eacd828d7e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2019-03-15 Alan Modra + + 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 PR 24336 diff --git a/bfd/elf.c b/bfd/elf.c index 73fb86971f..585bf3ca7d 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -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, -- 2.34.1