FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preserve artificial CU name in process_psymtab_comp_unit_reader

Browse source 
This fixes a use-after-free that Simon pointed out.
process_psymtab_comp_unit_reader was allocating an artificial name for
a CU, and then discarding it.  However, this name was preserved in the
cached file_and_directory.  This patch arranges for the allocated name
to be preserved there.
This commit is contained in:
Tom Tromey 2021-12-05 13:13:33 -07:00
parent 843bf75416
commit 33af066d07
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gdb/dwarf2/file-and-dir.h
View file

@ -84,9 +84,10 @@ struct file_and_directory
}
/* Set the filename. */
void set_name (const char *name)
void set_name (gdb::unique_xmalloc_ptr<char> name)
{
m_name = name;
m_name_storage = std::move (name);
m_name = m_name_storage.get ();
}
private:
@ -94,6 +95,9 @@ private:
/* The filename. */
const char *m_name;
/* Storage for the filename, if needed. */
gdb::unique_xmalloc_ptr<char> m_name_storage;
/* The compilation directory. NULL if not known. If we needed to
compute a new string, it will be stored in the comp_dir_storage
member, and this will be NULL. Otherwise, points directly to the

6
gdb/dwarf2/read.c
View file

@ -6986,15 +6986,15 @@ process_psymtab_comp_unit_reader (const struct die_reader_specs *reader,
prepare_one_comp_unit (cu, comp_unit_die, pretend_language);
/* Allocate a new partial symbol table structure. */
gdb::unique_xmalloc_ptr<char> debug_filename;
static const char artificial[] = "<artificial>";
file_and_directory &fnd = find_file_and_directory (comp_unit_die, cu);
if (strcmp (fnd.get_name (), artificial) == 0)
{
debug_filename.reset (concat (artificial, "@",
gdb::unique_xmalloc_ptr<char> debug_filename
(concat (artificial, "@",
sect_offset_str (per_cu->sect_off),
(char *) NULL));
fnd.set_name (debug_filename.get ());
fnd.set_name (std::move (debug_filename));
}
pst = create_partial_symtab (per_cu, per_objfile, fnd.get_name ());