From patchwork Wed Mar 27 16:40:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87710 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A6596385C6F7 for ; Wed, 27 Mar 2024 16:42:04 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id 20D053858C98 for ; Wed, 27 Mar 2024 16:41:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 20D053858C98 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 20D053858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711557702; cv=none; b=Y0BNz023jJ+/n6bBHQCc3PaiDUboxueChz3oCw4u6DcEkjo9MZo/Au7WB9au26HriR85P6/A5iFjc9cNZDSfQedzdYm59QdCZdPxZAfKxN2CkmROa1hKtutY4eA19H6+n1zK20FroH46WBhsejmVjrzvf30oQc5Xj7o15JnkYzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711557702; c=relaxed/simple; bh=r59Nz3nG2iXOaaQWT3OIkXyTstzoWqnBOBMy9NJEdqw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Ba7bahC5i0H+B0lFentddMsiunChq9iee4YC9Y2F59jAE+s3iRnvJD5/SvSgdj6yj6GsHKkrUw35P2bpCwVBccuGuNXYzzXvtJSy31bkXqMG5CilsmsP5Dyh/jvHxZGYO945BWw41yOKdoeg/OYs7q6bKvqnh2D+OwuCpyoKwTQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5004a.ext.cloudfilter.net ([10.0.29.221]) by cmsmtp with ESMTPS id pWKmrZ4fEPM1hpWKvrubfX; Wed, 27 Mar 2024 16:41:14 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id pWKMrmEwkGDo0pWKNr2oOC; Wed, 27 Mar 2024 16:40:39 +0000 X-Authority-Analysis: v=2.4 cv=I+uuR8gg c=1 sm=1 tr=0 ts=66044c07 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=K6JAEmCyrfEA:10 a=Qbun_eYptAEA:10 a=CCpqsmhAAAAA:8 a=gKot2_4BPeuTIhUst0gA:9 a=ul9cdbp4aOFLsgKbc677:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Ly1/Cx4NfrNvNzJAvUsiGxmaGz3GpR/v7AvW5jekFhw=; b=QmqYbjBVSjKx5woplx2Za/CL5a rSPlh0U7NOBmGpkzhjuU3qpSg9TEui24Tar9W2B8Lchm5mcwRNQmH8qj5NpbSb/ubzjFPZc0l3iP1 pyvXkbDlw1sY4GN0GoeDoewm4; Received: from 97-122-82-115.hlrn.qwest.net ([97.122.82.115]:59934 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rpWKM-000n18-1t; Wed, 27 Mar 2024 10:40:38 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Make pascal_language::print_type handle varstring==nullptr Date: Wed, 27 Mar 2024 10:40:31 -0600 Message-ID: <20240327164031.1582317-1-tom@tromey.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.82.115 X-Source-L: No X-Exim-ID: 1rpWKM-000n18-1t X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-82-115.hlrn.qwest.net (localhost.localdomain) [97.122.82.115]:59934 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfC1GNuFQTzAUkZbfHlvB7HV5lYERsD8VO1EkY4A3ZHuTlNdAZH0tK8YsoYQxDLMOsNu2o3LF+eo8thdCHZb4RN1MyoWZslUsrR+yB1NuI73y6s4ETjq7 FwRRnZukl4tcb9gwF2PZdu0PEBtdPDFKL6BIcdvfJGfiSn8TGPD+IrOdZamsJ8HaISe5CCpZxWHcEA0Xc2VZf0ZlEAze1Pgae0U= X-Spam-Status: No, score=-3021.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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+patchwork=sourceware.org@sourceware.org PR gdb/31524 points out a crash when pascal_language::print_type is called with varstring==nullptr. This crash is a regression arising from the printf/pager rewrite -- that indirectly removed a NULL check from gdb's "puts". This patch instead fixes the problem by adding a check to print_type. Passing nullptr here seems to be expected in other places (e.g., there is a call to type_print like this in expprint.c), and other implementations of this method (or related helpers) explicitly check for NULL. I didn't write a test case for this because it seemed like overkill for a Pascal bug that only occurs with -i=mi. However, if you want one, let me know and I will do it. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31524 --- gdb/p-typeprint.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c index 5c48c1400c4..ad98d9ef202 100644 --- a/gdb/p-typeprint.c +++ b/gdb/p-typeprint.c @@ -54,7 +54,8 @@ pascal_language::print_type (struct type *type, const char *varstring, type_print_varspec_prefix (type, stream, show, 0, flags); } /* first the name */ - gdb_puts (varstring, stream); + if (varstring != nullptr) + gdb_puts (varstring, stream); if ((varstring != NULL && *varstring != '\0') && !(code == TYPE_CODE_FUNC