From patchwork Tue Nov 15 18:54:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 60661 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 AFB6E38A90AA for ; Tue, 15 Nov 2022 18:55:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AFB6E38A90AA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668538513; bh=bFbxr/mrieazgQj6Mn/4HF3+AkwuB/b5ZSoYYv9omF8=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=IEgsVYK9iV3RKG5WVToLIhDMMCTn4rrtWZ1Gk1N7ULdApPMidSa4FZ2tEG/mh/kJN BoS+Fn+VExuPwBKVpFyLPUiqC06G/YTOoIQvJP2Xw1UJiCR4krADAKz4WiJY+bddeY TTTpP+YO+EJCo4pOnEfbZ4a0CRN7/E7QqH9tz6G4= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) by sourceware.org (Postfix) with ESMTPS id 4D3FA388214C for ; Tue, 15 Nov 2022 18:54:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4D3FA388214C Received: by mail-io1-xd32.google.com with SMTP id s10so11383914ioa.5 for ; Tue, 15 Nov 2022 10:54:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bFbxr/mrieazgQj6Mn/4HF3+AkwuB/b5ZSoYYv9omF8=; b=Ze9NQga8hZaroV2r8H0/SMmQesFlr8kbPQUYcZ53eifv42pvhSnx/pnpExBKCeE4KD uE1DbRqJze7eRuGZuKbyZslELjn32ZqQY7coWJPnwdjdszdwSl2Qh+TPvnQg8Ki0Tgtm DZD5L8ZMVWXu+v6//SAV3cwB85S+9Mz5S57OehQE50CmvJ6HCl/Nb60HIZt65W6PRfOZ zN421m6Y6PiaunzYHFJzhKWmAX4KWdXK+NSN+7DrMPc4Kk44MsiHj9bs4Qy2BolaKtNy q4Pq3ugTNXhAuDf1Io9jv2ugzKxzef+nLk1SXSZOANkm5f1k8oxYbpP10Is+B0uK5Tuj Uaxg== X-Gm-Message-State: ANoB5pky6YcBDsbI8I0xIvlsUSih9q6BV4Lz52kqGVLjEUJmemi1fLUd nm57cQn35q6UGpfvFAt/BQ/WGciqJ/sYAA== X-Google-Smtp-Source: AA0mqf51hq+Xa9EN2U6UcQROMHbc0T7vPvKNzgUK84yaRQhvW73gACPLLssqrhMhPHsiUw03+oLsSQ== X-Received: by 2002:a05:6602:702:b0:6de:3107:a863 with SMTP id f2-20020a056602070200b006de3107a863mr3241054iox.129.1668538488530; Tue, 15 Nov 2022 10:54:48 -0800 (PST) Received: from localhost.localdomain (97-122-76-186.hlrn.qwest.net. [97.122.76.186]) by smtp.gmail.com with ESMTPSA id z26-20020a05663822ba00b00363ec4dcaacsm5032543jas.22.2022.11.15.10.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 10:54:48 -0800 (PST) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Fix crash in ada_print_type Date: Tue, 15 Nov 2022 11:54:38 -0700 Message-Id: <20221115185438.120263-1-tromey@adacore.com> X-Mailer: git-send-email 2.34.3 MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" The "varstring" paramter to ada_print_type can be null, but one spot failed to check this. This could cause a crash in some situations. As this is Ada-specific, and we've been using it internally at AdaCore for a while, I am going to push it. --- gdb/ada-typeprint.c | 7 +-- gdb/testsuite/gdb.ada/overload_menu_crash.exp | 46 +++++++++++++++++++ .../gdb.ada/overload_menu_crash/main.adb | 21 +++++++++ .../gdb.ada/overload_menu_crash/pck.adb | 21 +++++++++ .../gdb.ada/overload_menu_crash/pck.ads | 22 +++++++++ 5 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 gdb/testsuite/gdb.ada/overload_menu_crash.exp create mode 100644 gdb/testsuite/gdb.ada/overload_menu_crash/main.adb create mode 100644 gdb/testsuite/gdb.ada/overload_menu_crash/pck.adb create mode 100644 gdb/testsuite/gdb.ada/overload_menu_crash/pck.ads diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c index c79226fcd7d..82a74a571c6 100644 --- a/gdb/ada-typeprint.c +++ b/gdb/ada-typeprint.c @@ -925,8 +925,8 @@ print_func_type (struct type *type, struct ui_file *stream, const char *name, /* Print a description of a type TYPE0. Output goes to STREAM (via stdio). - If VARSTRING is a non-empty string, print as an Ada variable/field - declaration. + If VARSTRING is a non-NULL, non-empty string, print as an Ada + variable/field declaration. SHOW+1 is the maximum number of levels of internal type structure to show (this applies to record types, enumerated types, and array types). @@ -996,7 +996,8 @@ ada_print_type (struct type *type0, const char *varstring, /* An __XVL field is not truly a pointer, so don't print "access" in this case. */ if (type->code () != TYPE_CODE_PTR - || strstr (varstring, "___XVL") == nullptr) + || (varstring != nullptr + && strstr (varstring, "___XVL") == nullptr)) gdb_printf (stream, "access "); ada_print_type (type->target_type (), "", stream, show, level, flags); diff --git a/gdb/testsuite/gdb.ada/overload_menu_crash.exp b/gdb/testsuite/gdb.ada/overload_menu_crash.exp new file mode 100644 index 00000000000..a6381a3a448 --- /dev/null +++ b/gdb/testsuite/gdb.ada/overload_menu_crash.exp @@ -0,0 +1,46 @@ +# Copyright 2022 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Regression test for a crash in the overload menu. + +load_lib "ada.exp" + +if { [skip_ada_tests] } { return -1 } + +standard_ada_testfile main + +if {[gdb_compile_ada "$srcfile" "$binfile" executable {debug}] != ""} { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "BREAK" ${testdir}/main.adb] +runto "main.adb:$bp_location" + +set menu [multi_line "Multiple matches for regtest" \ + "\\\[0\\\] cancel" \ + "\\\[1\\\] pck.inner.regtest at .*pck.ads:\[0-9\]+" \ + "\\\[2\\\] pck.regtest .* return boolean at .*pck.adb:\[0-9\]+" \ + "> $"] +gdb_test_multiple "whatis ®test" "menu does not crash" { + -re "$menu" { + pass "$gdb_test_name" + } + default { + fail "$gdb_test_name" + } +} +gdb_test "1" "type = access boolean" "choose from menu" diff --git a/gdb/testsuite/gdb.ada/overload_menu_crash/main.adb b/gdb/testsuite/gdb.ada/overload_menu_crash/main.adb new file mode 100644 index 00000000000..3d3e516d72f --- /dev/null +++ b/gdb/testsuite/gdb.ada/overload_menu_crash/main.adb @@ -0,0 +1,21 @@ +-- Copyright 2022 Free Software Foundation, Inc. +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +with Pck; + +procedure Main is +begin + Pck.Inner.Regtest := Pck.Regtest (null); -- BREAK +end Main; diff --git a/gdb/testsuite/gdb.ada/overload_menu_crash/pck.adb b/gdb/testsuite/gdb.ada/overload_menu_crash/pck.adb new file mode 100644 index 00000000000..cf01fb3bebd --- /dev/null +++ b/gdb/testsuite/gdb.ada/overload_menu_crash/pck.adb @@ -0,0 +1,21 @@ +-- Copyright 2022 Free Software Foundation, Inc. +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +package body Pck is + function Regtest (A : access Integer) return Boolean is + begin + return True; + end Regtest; +end Pck; diff --git a/gdb/testsuite/gdb.ada/overload_menu_crash/pck.ads b/gdb/testsuite/gdb.ada/overload_menu_crash/pck.ads new file mode 100644 index 00000000000..f0ff4f4714b --- /dev/null +++ b/gdb/testsuite/gdb.ada/overload_menu_crash/pck.ads @@ -0,0 +1,22 @@ +-- Copyright 2022 Free Software Foundation, Inc. +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +package Pck is + package Inner is + Regtest : Boolean; + end Inner; + + function Regtest (A : access Integer) return Boolean; +end Pck;