summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2017-06-14 17:01:54 +0100
committerNick Clifton <nickc@redhat.com>2017-06-14 17:01:54 +0100
commitf461bbd847f15657f3dd2f317c30c75a7520da1f (patch)
treebcf1f76106ba8b42b0852e17bb062e5157c76903
parentae87f7e73eba29bd38b3a9684a10b948ed715612 (diff)
downloadbinutils-gdb-f461bbd847f15657f3dd2f317c30c75a7520da1f.tar.gz
Fix address violation bug when disassembling a corrupt SH binary.
PR binutils/21578 * elf32-sh.c (sh_elf_set_mach_from_flags): Fix check for invalid flag value.
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-sh.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 761514fe3c4..b9133d22ba1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
2017-06-14 Nick Clifton <nickc@redhat.com>
+ PR binutils/21578
+ * elf32-sh.c (sh_elf_set_mach_from_flags): Fix check for invalid
+ flag value.
+
+2017-06-14 Nick Clifton <nickc@redhat.com>
+
PR binutils/21589
* vms-alpha.c (_bfd_vms_get_value): Add an extra parameter - the
maximum value for the ascic pointer. Check that name processing
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 3b1cc67ee26..3df13b5a1aa 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -6344,7 +6344,7 @@ sh_elf_set_mach_from_flags (bfd *abfd)
{
flagword flags = elf_elfheader (abfd)->e_flags & EF_SH_MACH_MASK;
- if (flags >= sizeof(sh_ef_bfd_table))
+ if (flags >= ARRAY_SIZE (sh_ef_bfd_table))
return FALSE;
if (sh_ef_bfd_table[flags] == 0)