Commit: bda22572abf4a7aac66c07bdb7549ee8c03b58f5 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revision: bda22572abf4a7aac66c07bdb7549ee8c03b58f5 (tree)
• Time: 2003-12-27 22:52:51
• Author: Mark Kettenis <kettenis@gnu....>
• Commiter: Mark Kettenis

Log Message

Merge from mainline:

2003-10-31 Jim Blandy <[e-mail]>

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

Change Summary

• modified: gdb/ChangeLog
• modified: gdb/elfread.c

Incremental Difference

--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
 2003-12-27  Mark Kettenis  <[e-mail]>
 
+	Merge from mainline:
+
+	2003-10-31  Jim Blandy  <[e-mail]>
+
+	* elfread.c (elf_symtab_read): Allocate correct number of tail
+	elements to sectinfo structure.  (Fix from Woody LaRue.)
+
[phone]  Mark Kettenis  <[e-mail]>
+
 	* config/sparc/nbsd64.mh (NATDEPFILES): Add sparc64-nat.o.
 
 	* Makefile.in (sparc64fbsd-tdep.o): Update dependencies.

--- 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);