Fix buffer overflow regression due to minsym malloc-ed instead of obstack-ed.

[deliverable/binutils-gdb.git] / gdb / symfile-debug.c

diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c
index 49c472e0d0dd782352bcba3133e905b4de4961aa..5b3ae926504e7b2548c5d587e48b0bcef5e7d2b9 100644 (file)
--- a/gdb/symfile-debug.c
+++ b/gdb/symfile-debug.c
@@ -1,6 +1,6 @@
 /* Debug logging for the symbol file functions for the GNU debugger, GDB.
 
-   Copyright (C) 2013-2017 Free Software Foundation, Inc.
+   Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
    Contributed by Cygnus Support, using pieces from other GDB modules.
 
@@ -28,7 +28,7 @@
 #include "defs.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
-#include "observer.h"
+#include "observable.h"
 #include "source.h"
 #include "symtab.h"
 #include "symfile.h"
@@ -193,23 +193,6 @@ debug_qf_dump (struct objfile *objfile)
   debug_data->real_sf->qf->dump (objfile);
 }
 
-static void
-debug_qf_relocate (struct objfile *objfile,
-                  const struct section_offsets *new_offsets,
-                  const struct section_offsets *delta)
-{
-  const struct debug_sym_fns_data *debug_data
-    = ((const struct debug_sym_fns_data *)
-       objfile_data (objfile, symfile_debug_objfile_data_key));
-
-  fprintf_filtered (gdb_stdlog, "qf->relocate (%s, %s, %s)\n",
-                   objfile_debug_name (objfile),
-                   host_address_to_string (new_offsets),
-                   host_address_to_string (delta));
-
-  debug_data->real_sf->qf->relocate (objfile, new_offsets, delta);
-}
-
 static void
 debug_qf_expand_symtabs_for_function (struct objfile *objfile,
                                      const char *func_name)
@@ -257,7 +240,7 @@ static void
 debug_qf_map_matching_symbols (struct objfile *objfile,
                               const char *name, domain_enum domain,
                               int global,
-                              int (*callback) (struct block *,
+                              int (*callback) (const struct block *,
                                                struct symbol *, void *),
                               void *data,
                               symbol_name_match_type match,
@@ -365,6 +348,33 @@ debug_qf_map_symbol_filenames (struct objfile *objfile,
                                                 need_fullname);
 }
 
+static struct compunit_symtab *
+debug_qf_find_compunit_symtab_by_address (struct objfile *objfile,
+                                         CORE_ADDR address)
+{
+  const struct debug_sym_fns_data *debug_data
+    = ((const struct debug_sym_fns_data *)
+       objfile_data (objfile, symfile_debug_objfile_data_key));
+  fprintf_filtered (gdb_stdlog,
+                   "qf->find_compunit_symtab_by_address (%s, %s)\n",
+                   objfile_debug_name (objfile),
+                   hex_string (address));
+
+  struct compunit_symtab *result = NULL;
+  if (debug_data->real_sf->qf->map_symbol_filenames != NULL)
+    result
+      = debug_data->real_sf->qf->find_compunit_symtab_by_address (objfile,
+                                                                 address);
+
+  fprintf_filtered (gdb_stdlog,
+                   "qf->find_compunit_symtab_by_address (...) = %s\n",
+                   result
+                   ? debug_symtab_name (compunit_primary_filetab (result))
+                   : "NULL");
+
+  return result;
+}
+
 static const struct quick_symbol_functions debug_sym_quick_functions =
 {
   debug_qf_has_symbols,
@@ -374,13 +384,13 @@ static const struct quick_symbol_functions debug_sym_quick_functions =
   debug_qf_lookup_symbol,
   debug_qf_print_stats,
   debug_qf_dump,
-  debug_qf_relocate,
   debug_qf_expand_symtabs_for_function,
   debug_qf_expand_all_symtabs,
   debug_qf_expand_symtabs_with_fullname,
   debug_qf_map_matching_symbols,
   debug_qf_expand_symtabs_matching,
   debug_qf_find_pc_sect_compunit_symtab,
+  debug_qf_find_compunit_symtab_by_address,
   debug_qf_map_symbol_filenames
 };
 \f
@@ -478,7 +488,7 @@ debug_sym_finish (struct objfile *objfile)
 
 static void
 debug_sym_offsets (struct objfile *objfile,
-                  const struct section_addr_info *info)
+                  const section_addr_info &info)
 {
   const struct debug_sym_fns_data *debug_data
     = ((const struct debug_sym_fns_data *)
@@ -486,7 +496,7 @@ debug_sym_offsets (struct objfile *objfile,
 
   fprintf_filtered (gdb_stdlog, "sf->sym_offsets (%s, %s)\n",
                    objfile_debug_name (objfile),
-                   host_address_to_string (info));
+                   host_address_to_string (&info));
 
   debug_data->real_sf->sym_offsets (objfile, info);
 }
@@ -650,22 +660,21 @@ static void
 set_debug_symfile (const char *args, int from_tty, struct cmd_list_element *c)
 {
   struct program_space *pspace;
-  struct objfile *objfile;
 
   ALL_PSPACES (pspace)
-    ALL_PSPACE_OBJFILES (pspace, objfile)
-    {
-      if (debug_symfile)
-       {
-         if (!symfile_debug_installed (objfile))
-           install_symfile_debug_logging (objfile);
-       }
-      else
-       {
-         if (symfile_debug_installed (objfile))
-           uninstall_symfile_debug_logging (objfile);
-       }
-    }
+    for (objfile *objfile : pspace->objfiles ())
+      {
+       if (debug_symfile)
+         {
+           if (!symfile_debug_installed (objfile))
+             install_symfile_debug_logging (objfile);
+         }
+       else
+         {
+           if (symfile_debug_installed (objfile))
+             uninstall_symfile_debug_logging (objfile);
+         }
+      }
 }
 
 static void