crash printing non-local variable from nested subprogram

[deliverable/binutils-gdb.git] / gdb / coffread.c

diff --git a/gdb/coffread.c b/gdb/coffread.c
index 28f7b18120f483d2018a1480ef8675570f8c36cd..a5033d1666a8d26c06ad8cc768318eecd2a11345 100644 (file)
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -41,6 +41,7 @@
 #include "coff-pe-read.h"
 
 #include "psymtab.h"
+#include "build-id.h"
 
 extern void _initialize_coffread (void);
 
@@ -252,8 +253,7 @@ coff_locate_sections (bfd *abfd, asection *sectp, void *csip)
        {
          struct stab_section_list *n, **pn;
 
-         n = ((struct stab_section_list *)
-              xmalloc (sizeof (struct stab_section_list)));
+         n = XNEW (struct stab_section_list);
          n->section = sectp;
          n->next = NULL;
          for (pn = &csi->stabsects; *pn != NULL; pn = &(*pn)->next)
@@ -671,20 +671,31 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
             or "_imp_", get rid of the prefix, and search the minimal
             symbol in OBJFILE.  Note that 'maintenance print msymbols'
             shows that type of these "_imp_XXXX" symbols is mst_data.  */
-         if (MSYMBOL_TYPE (msym) == mst_data
-             && (startswith (name, "__imp_")
-                 || startswith (name, "_imp_")))
+         if (MSYMBOL_TYPE (msym) == mst_data)
            {
-             const char *name1 = (name[1] == '_' ? &name[7] : &name[6]);
-             struct bound_minimal_symbol found;
-
-             found = lookup_minimal_symbol (name1, NULL, objfile);
-             /* If found, there are symbols named "_imp_foo" and "foo"
-                respectively in OBJFILE.  Set the type of symbol "foo"
-                as 'mst_solib_trampoline'.  */
-             if (found.minsym != NULL
-                 && MSYMBOL_TYPE (found.minsym) == mst_text)
-               MSYMBOL_TYPE (found.minsym) = mst_solib_trampoline;
+             const char *name1 = NULL;
+
+             if (startswith (name, "_imp_"))
+               name1 = name + 5;
+             else if (startswith (name, "__imp_"))
+               name1 = name + 6;
+             if (name1 != NULL)
+               {
+                 int lead = bfd_get_symbol_leading_char (objfile->obfd);
+                 struct bound_minimal_symbol found;
+
+                  if (lead != '\0' && *name1 == lead)
+                   name1 += 1;
+
+                 found = lookup_minimal_symbol (name1, NULL, objfile);
+
+                 /* If found, there are symbols named "_imp_foo" and "foo"
+                    respectively in OBJFILE.  Set the type of symbol "foo"
+                    as 'mst_solib_trampoline'.  */
+                 if (found.minsym != NULL
+                     && MSYMBOL_TYPE (found.minsym) == mst_text)
+                   MSYMBOL_TYPE (found.minsym) = mst_solib_trampoline;
+               }
            }
        }
     }
@@ -727,7 +738,10 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
     {
       char *debugfile;
 
-      debugfile = find_separate_debug_file_by_debuglink (objfile);
+      debugfile = find_separate_debug_file_by_buildid (objfile);
+
+      if (debugfile == NULL)
+       debugfile = find_separate_debug_file_by_debuglink (objfile);
       make_cleanup (xfree, debugfile);
 
       if (debugfile)
@@ -826,9 +840,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
   if (type_vector)             /* Get rid of previous one.  */
     xfree (type_vector);
   type_vector_length = INITIAL_TYPE_VECTOR_LENGTH;
-  type_vector = (struct type **)
-    xmalloc (type_vector_length * sizeof (struct type *));
-  memset (type_vector, 0, type_vector_length * sizeof (struct type *));
+  type_vector = XCNEWVEC (struct type *, type_vector_length);
 
   coff_start_symtab (objfile, "");
 
@@ -1129,8 +1141,8 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
                enter_linenos (fcn_line_ptr, fcn_first_line,
                               fcn_last_line, objfile);
 
-             finish_block (newobj->name, &local_symbols,
-                           newobj->old_blocks, newobj->start_addr,
+             finish_block (newobj->name, &local_symbols, newobj->old_blocks,
+                           NULL, newobj->start_addr,
                            fcn_cs_saved.c_value
                            + fcn_aux_saved.x_sym.x_misc.x_fsize
                            + ANOFFSET (objfile->section_offsets,
@@ -1173,7 +1185,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
                    cs->c_value + ANOFFSET (objfile->section_offsets,
                                            SECT_OFF_TEXT (objfile));
                  /* Make a block for the local symbols within.  */
-                 finish_block (0, &local_symbols, newobj->old_blocks,
+                 finish_block (0, &local_symbols, newobj->old_blocks, NULL,
                                newobj->start_addr, tmpaddr);
                }
              /* Now pop locals of block just finished.  */
@@ -2087,7 +2099,7 @@ coff_read_struct_type (int index, int length, int lastsym,
        case C_MOU:
 
          /* Get space to record the next field's data.  */
-         newobj = (struct nextfield *) alloca (sizeof (struct nextfield));
+         newobj = XALLOCA (struct nextfield);
          newobj->next = list;
          list = newobj;
 
@@ -2104,7 +2116,7 @@ coff_read_struct_type (int index, int length, int lastsym,
        case C_FIELD:
 
          /* Get space to record the next field's data.  */
-         newobj = (struct nextfield *) alloca (sizeof (struct nextfield));
+         newobj = XALLOCA (struct nextfield);
          newobj->next = list;
          list = newobj;