]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
gdb: restore nullptr check in compunit_symtab::find_call_site
authorSimon Marchi <simon.marchi@efficios.com>
Tue, 3 Dec 2024 15:52:18 +0000 (10:52 -0500)
committerSimon Marchi <simon.marchi@polymtl.ca>
Tue, 3 Dec 2024 19:18:59 +0000 (14:18 -0500)
Commit de2b4ab50de ("Convert dwarf2_cu::call_site_htab to new hash
table") removed this nullptr check for no good reason.  This causes a
crash if `m_call_site_htab` is not set, as shown in PR 32410.  My guess
is that when doing this change, I tried to make `m_call_site_htab` not a
pointer, removed this check, then realized it wasn't so obvious, and
forgot to re-add the check.

Change-Id: I455e00cdc0519dfb412dc7826d17a839b77aae69
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32410
Approved-By: Tom Tromey <tom@tromey.com>
Approved-By: Tom de Vries <tdevries@suse.de>
gdb/symtab.c

index edc19ff5c155be9e41c7d08aaa998afaa47bf1aa..30c22dcea38cb3e267901796964a1a119648dd3a 100644 (file)
@@ -396,6 +396,9 @@ linetable_entry::pc (const struct objfile *objfile) const
 call_site *
 compunit_symtab::find_call_site (CORE_ADDR pc) const
 {
+  if (m_call_site_htab == nullptr)
+    return nullptr;
+
   CORE_ADDR delta = this->objfile ()->text_section_offset ();
 
   if (auto it = m_call_site_htab->find (static_cast<unrelocated_addr> (pc - delta));