From: Nick Clifton <nickc@redhat.com>
Date: Tue, 23 Aug 2016 08:45:11 +0000 (+0100)
Subject: Fix seg-fault in ARM linker when trying to parse a binary file.
X-Git-Tag: users/ARM/embedded-binutils-master-2016q4~866
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6342be709e8749d0a44c02e1876ddca360bfd52f;p=thirdparty%2Fbinutils-gdb.git

Fix seg-fault in ARM linker when trying to parse a binary file.

	* elf32-arm.c (elf32_arm_count_additional_relocs): Return zero if
	there is no arm data associated with the section.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1aad274f1dc..84fceea4fac 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-23  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.c (elf32_arm_count_additional_relocs): Return zero if
+	there is no arm data associated with the section.
+
 2016-08-23  Alan Modra  <amodra@gmail.com>
 
 	PR 20475
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 1eba21b42dd..4478238ee00 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -18688,7 +18688,7 @@ elf32_arm_count_additional_relocs (asection *sec)
 {
   struct _arm_elf_section_data *arm_data;
   arm_data = get_arm_elf_section_data (sec);
-  return arm_data->additional_reloc_count;
+  return arm_data == NULL ? 0 : arm_data->additional_reloc_count;
 }
 
 /* Called to set the sh_flags, sh_link and sh_info fields of OSECTION which