aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2007-05-14 04:15:53 +0000
committerAlan Modra <amodra@gmail.com>2007-05-14 04:15:53 +0000
commit74f2e02bf4ceb4b0f1440f4eba247a467c45ed35 (patch)
tree5dfae5c8652cc4cae95d1fe949dedcbe313b8e8d /bfd
parenta1513dafcc7172b4fb5fe771acd7cfa3fb4a58b7 (diff)
downloadgdb-74f2e02bf4ceb4b0f1440f4eba247a467c45ed35.zip
gdb-74f2e02bf4ceb4b0f1440f4eba247a467c45ed35.tar.gz
gdb-74f2e02bf4ceb4b0f1440f4eba247a467c45ed35.tar.bz2
* elf.c (bfd_elf_string_from_elf_section): Return NULL on
invalid shstrndx. (bfd_elf_get_str_section): Likewise.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 81848c0..c866291 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-14 Alan Modra <amodra@bigpond.net.au>
+
+ * elf.c (bfd_elf_string_from_elf_section): Return NULL on
+ invalid shstrndx.
+ (bfd_elf_get_str_section): Likewise.
+
2007-05-12 Alan Modra <amodra@bigpond.net.au>
PR 4497
diff --git a/bfd/elf.c b/bfd/elf.c
index 6e1ab96..458c679 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -252,7 +252,9 @@ bfd_elf_get_str_section (bfd *abfd, unsigned int shindex)
bfd_size_type shstrtabsize;
i_shdrp = elf_elfsections (abfd);
- if (i_shdrp == 0 || i_shdrp[shindex] == 0)
+ if (i_shdrp == 0
+ || shindex >= elf_numsections (abfd)
+ || i_shdrp[shindex] == 0)
return NULL;
shstrtab = i_shdrp[shindex]->contents;
@@ -291,6 +293,9 @@ bfd_elf_string_from_elf_section (bfd *abfd,
if (strindex == 0)
return "";
+ if (elf_elfsections (abfd) == NULL || shindex >= elf_numsections (abfd))
+ return NULL;
+
hdr = elf_elfsections (abfd)[shindex];
if (hdr->contents == NULL