aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2008-01-31 10:48:35 +0000
committerNick Clifton <nickc@redhat.com>2008-01-31 10:48:35 +0000
commitb7c368d0b619a58d63888fdd99d627ce177b322a (patch)
treec31f49cd29279876807e9e7cacf62392c535d114 /bfd
parent9cc8ae67f6138e1b8887075f4c25d7e09c81d2e9 (diff)
downloadgdb-b7c368d0b619a58d63888fdd99d627ce177b322a.zip
gdb-b7c368d0b619a58d63888fdd99d627ce177b322a.tar.gz
gdb-b7c368d0b619a58d63888fdd99d627ce177b322a.tar.bz2
PR ld/5692
* elf.c (bfd_elf_get_elf_syms): Check the return value of get_elf_backend_data.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf.c9
2 files changed, 13 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9c76971..782c784 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-31 Nick Clifton <nickc@redhat.com>
+
+ PR ld/5692
+ * elf.c (bfd_elf_get_elf_syms): Check the return value of
+ get_elf_backend_data.
+
2008-01-28 Fabian Groffen <grobian@gentoo.org>
* config.bfd (x86_64-*-solaris2): Add support for this target.
diff --git a/bfd/elf.c b/bfd/elf.c
index 6022104..b8b7c92 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -1,7 +1,7 @@
/* ELF executable support for BFD.
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
@@ -326,7 +326,9 @@ bfd_elf_string_from_elf_section (bfd *abfd,
SYMCOUNT specifies the number of symbols to read, starting from
symbol SYMOFFSET. If any of INTSYM_BUF, EXTSYM_BUF or EXTSHNDX_BUF
are non-NULL, they are used to store the internal symbols, external
- symbols, and symbol section index extensions, respectively. */
+ symbols, and symbol section index extensions, respectively.
+ Returns a pointer to the internal symbol buffer (malloced if necessary)
+ or NULL if there were no symbols or some kind of problem. */
Elf_Internal_Sym *
bfd_elf_get_elf_syms (bfd *ibfd,
@@ -361,6 +363,9 @@ bfd_elf_get_elf_syms (bfd *ibfd,
alloc_ext = NULL;
alloc_extshndx = NULL;
bed = get_elf_backend_data (ibfd);
+ /* PR ld/5692: Check for non-ELF files. */
+ if (bed == NULL)
+ return NULL;
extsym_size = bed->s->sizeof_sym;
amt = symcount * extsym_size;
pos = symtab_hdr->sh_offset + symoffset * extsym_size;