Fixes part of a problem reading deliberately non-conforming ELF binaries - where a

note segment is present but no note section.

	* readelf.c (process_note_sections): If there are no note sections
	try processing note segments instead.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 71eca314fa21246c5c9a232ec7740bee030b1a8b..cc698cb0aaf78909e0804c6cdc88e91a1719e1e3 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-26  Nick Clifton  <nickc@redhat.com>
+
+       * readelf.c (process_note_sections): If there are no note sections
+       try processing note segments instead.
+
 2014-06-17  Anton Lavrentiwev  <lavr@ncbi.nim.nih.gov>
 
        PR binutils/16923

diff --git a/binutils/readelf.c b/binutils/readelf.c
index af6463e6ad47e22ec84e5b5588a166d1fc105ae8..d85786e28a1be907cce6f1838a3214a26f677b18 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -14050,15 +14050,23 @@ process_note_sections (FILE * file)
 {
   Elf_Internal_Shdr * section;
   unsigned long i;
+  int n = 0;
   int res = 1;
 
   for (i = 0, section = section_headers;
        i < elf_header.e_shnum && section != NULL;
        i++, section++)
     if (section->sh_type == SHT_NOTE)
-      res &= process_corefile_note_segment (file,
-                                           (bfd_vma) section->sh_offset,
-                                           (bfd_vma) section->sh_size);
+      {
+       res &= process_corefile_note_segment (file,
+                                             (bfd_vma) section->sh_offset,
+                                             (bfd_vma) section->sh_size);
+       n++;
+      }
+
+  if (n == 0)
+    /* Try processing NOTE segments instead.  */
+    return process_corefile_note_segments (file);
 
   return res;
 }