From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id KEIDA2IpT2ewugIAWB0awg (envelope-from ) for ; Tue, 03 Dec 2024 10:53:06 -0500 Received: by simark.ca (Postfix, from userid 112) id F14A51E0BB; Tue, 3 Dec 2024 10:53:05 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable autolearn_force=no version=4.0.0 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id A87E81E092 for ; Tue, 3 Dec 2024 10:53:05 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 391503858C2B for ; Tue, 3 Dec 2024 15:53:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 391503858C2B Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id E91553858D33 for ; Tue, 3 Dec 2024 15:52:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E91553858D33 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E91553858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1733241146; cv=none; b=oAPpKHqSG01g5fMY7HK+pMoZSzHtADlHxvPCzHMic3Xsh9GreevnYZ0swaRLYkV3lQ1PVlozP/ntPSadtWbEoaQi6bl3R1li0meZzgCb8Q6F0NCb2/CGfQjDOkWyYAwmneMV5yCqOuT5VYviFTCedDYSY8H2YR+lQRio3URfuPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1733241146; c=relaxed/simple; bh=CH2Dxl/0/706aOSQ2FlG9I00aZiE26xM6+Wy85/ubTs=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=o+GDk4adr/azDUQtm9aPHeiFC1rGpp546e49ASXXyGn+RkOzAo1MKNP/+LHtFOcZ5wwj9zUmrrBtP2aKAgY+PtdLaPZAu7p47G+AAZnc+qHztEqiiCuUwzMdO3sKARtW7yM6crbzP2HL8J0bZ9IX+Bot23NEHxNkLXN1X3GmZNE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E91553858D33 Received: by simark.ca (Postfix, from userid 112) id A1D0D1E0BB; Tue, 3 Dec 2024 10:52:25 -0500 (EST) Received: from localhost.localdomain (unknown [204.48.79.192]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id D8F0F1E092; Tue, 3 Dec 2024 10:52:24 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH] gdb: restore nullptr check in compunit_symtab::find_call_site Date: Tue, 3 Dec 2024 10:52:18 -0500 Message-ID: <20241203155223.10203-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org 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 --- gdb/symtab.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gdb/symtab.c b/gdb/symtab.c index edc19ff5c155..30c22dcea38c 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -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 (pc - delta)); base-commit: d556cf2ec79ed5afbbdd523484954c6a520b5b73 -- 2.47.1