From 075e4d6d95681bfbf53e849c2802a75d1d4cbdca Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 2 Aug 2022 11:57:20 -0600 Subject: [PATCH] Use auto_obstack in objfile This changes objfile to use an auto_obstack. This helps prevent use-after-free bugs, because it ensures that anything allocated on the objfile obstack will live past the point at which the registry object is destroyed. --- gdb/objfiles.c | 7 ------- gdb/objfiles.h | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/gdb/objfiles.c b/gdb/objfiles.c index 3db9135a64b..c92da7548b3 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -324,10 +324,6 @@ objfile::objfile (gdb_bfd_ref_ptr bfd_, const char *name, objfile_flags flags_) { const char *expanded_name; - /* We could use obstack_specify_allocation here instead, but - gdb_obstack.h specifies the alloc/dealloc functions. */ - obstack_init (&objfile_obstack); - std::string name_holder; if (name == NULL) { @@ -583,9 +579,6 @@ objfile::~objfile () clear_current_source_symtab_and_line (); } - /* Free the obstacks for non-reusable objfiles. */ - obstack_free (&objfile_obstack, 0); - /* Rebuild section map next time we need it. */ get_objfile_pspace_data (pspace)->section_map_dirty = 1; } diff --git a/gdb/objfiles.h b/gdb/objfiles.h index eb85ed478c6..ac45fa3980f 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -666,7 +666,7 @@ public: /* Obstack to hold objects that should be freed when we load a new symbol table from this object file. */ - struct obstack objfile_obstack {}; + auto_obstack objfile_obstack; /* Structure which keeps track of functions that manipulate objfile's of the same type as this objfile. I.e. the function to read partial -- 2.30.2