Merge from mainline:

2003-10-31  Jim Blandy  <jimb@redhat.com>

* elfread.c (elf_symtab_read): Allocate correct number of tail
elements to sectinfo structure.  (Fix from Woody LaRue.)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0bc595710f3a416008967f37e60fb037f2021a91..fd4bd86bc2bffb453b6bcc1c481e9f526a684fa0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-27  Mark Kettenis  <kettenis@gnu.org>
+
+       Merge from mainline:
+
+       2003-10-31  Jim Blandy  <jimb@redhat.com>
+
+       * elfread.c (elf_symtab_read): Allocate correct number of tail
+       elements to sectinfo structure.  (Fix from Woody LaRue.)
+
 2003-12-27  Mark Kettenis  <kettenis@gnu.org>
 
        * config/sparc/nbsd64.mh (NATDEPFILES): Add sparc64-nat.o.

diff --git a/gdb/elfread.c b/gdb/elfread.c
index 8c278107d377eba5729f23fbfbe428119a9e55bc..9ac30aeeb9f3f8d71cca3f2aa59208629a258fc2 100644 (file)
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -398,9 +398,17 @@ elf_symtab_read (struct objfile *objfile, int dynamic)
                                = max (SECT_OFF_BSS (objfile),
                                       max (SECT_OFF_DATA (objfile),
                                            SECT_OFF_RODATA (objfile)));
+
+                              /* max_index is the largest index we'll
+                                 use into this array, so we must
+                                 allocate max_index+1 elements for it.
+                                 However, 'struct stab_section_info'
+                                 already includes one element, so we
+                                 need to allocate max_index aadditional
+                                 elements.  */
                              size = (sizeof (struct stab_section_info) 
                                      + (sizeof (CORE_ADDR)
-                                        * (max_index - 1)));
+                                        * max_index));
                              sectinfo = (struct stab_section_info *)
                                xmmalloc (objfile->md, size);
                              memset (sectinfo, 0, size);