diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4107449f96a..0dc369547ef 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/10363
+	* elf.c (bfd_elf_string_from_elf_section): Return NULL on
+	invalid string offset.
+
 2009-08-03  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/10433
diff --git a/bfd/elf.c b/bfd/elf.c
index f27c607ab2b..9863a3a32db 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -331,7 +331,7 @@ bfd_elf_string_from_elf_section (bfd *abfd,
 	 (shindex == shstrndx && strindex == hdr->sh_name
 	  ? ".shstrtab"
 	  : bfd_elf_string_from_elf_section (abfd, shstrndx, hdr->sh_name)));
-      return "";
+      return NULL;
     }
 
   return ((char *) hdr->contents) + strindex;