2005-05-24 H.J. Lu <hongjiu.lu@intel.com>

	* readelf.c (process_section_groups): Report group section
	index. Check if the section member index is valid.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 1a6bc31cd1d913b65234ee8a518bc5d9706cc0bb..e72be0b7557196c3f5eae2c10ec56df3b855f66e 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * readelf.c (process_section_groups): Report group section
+       index. Check if the section member index is valid.
+
 2005-05-23  Fred Fish  <fnf@specifixinc.com>
 
        * addr2line.c (unwind_inlines): New flag for 'i' option.

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 5dafc510c97798159f105442b902d5edae5f45ff..ab0243edb1d1383893db15adeb782dca3ce3138f 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -4187,8 +4187,8 @@ process_section_groups (FILE *file)
 
          if (do_section_groups)
            {
-             printf ("\n%s group section `%s' [%s] contains %u sections:\n",
-                     get_group_flags (entry), name, group_name, size);
+             printf ("\n%s group section [%5u] `%s' [%s] contains %u sections:\n",
+                     get_group_flags (entry), i, name, group_name, size);
 
              printf (_("   [Index]    Name\n"));
            }
@@ -4202,13 +4202,26 @@ process_section_groups (FILE *file)
              entry = byte_get (indices, 4);
              indices += 4;
 
+             if (entry >= elf_header.e_shnum)
+               {
+                 error (_("section [%5u] in group section [%5u] > maximum section [%5u]\n"),
+                        entry, i, elf_header.e_shnum - 1);
+                 continue;
+               }
+             else if (entry >= SHN_LORESERVE && entry <= SHN_HIRESERVE)
+               {
+                 error (_("invalid section [%5u] in group section [%5u]\n"),
+                        entry, i);
+                 continue;
+               }
+
              if (section_headers_groups [SECTION_HEADER_INDEX (entry)]
                  != NULL)
                {
                  if (entry)
                    {
-                     error (_("section [%5u] already in group section [%5u]\n"),
-                            entry,
+                     error (_("section [%5u] in group section [%5u] already in group section [%5u]\n"),
+                            entry, i,
                             section_headers_groups [SECTION_HEADER_INDEX (entry)]->group_index);
                      continue;
                    }