From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id D09BE38A909F; Tue, 15 Nov 2022 18:56:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D09BE38A909F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668538589; bh=wExFbe3mK+FrPfSsNNgLxx0hq9MrgJcN/JH7xS43Pb8=; h=From:To:Subject:Date:From; b=epjdKKGSQCthMzG5nqLwqS7llipWeVrPpvSvSvgj7NDyQA0RGHQVXgsEArH4frjrP ROPG8WgKAfI8qAcfpMsSrbQ0gNgO4dET4S9si/lqY3uc4GQQlrIw1p5Mw9WaXBLL9b 7czFjzY248Al+3KlN7AGPvNFLcjRNNGHFxI4eWDI= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix crash in ada_print_type X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: b0e8fa7ff0dc9a32ff71df0e895aa7fb5089fcfa X-Git-Newrev: 2c2316c5fd2bf6310c21c1c88a940be8494d1870 Message-Id: <20221115185629.D09BE38A909F@sourceware.org> Date: Tue, 15 Nov 2022 18:56:29 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D2c2316c5fd2b= f6310c21c1c88a940be8494d1870 commit 2c2316c5fd2bf6310c21c1c88a940be8494d1870 Author: Tom Tromey Date: Thu Oct 20 10:55:35 2022 -0600 Fix crash in ada_print_type =20 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. =20 As this is Ada-specific, and we've been using it internally at AdaCore for a while, I am going to push it. Diff: --- gdb/ada-typeprint.c | 7 ++-- gdb/testsuite/gdb.ada/overload_menu_crash.exp | 46 ++++++++++++++++++= ++++ gdb/testsuite/gdb.ada/overload_menu_crash/main.adb | 21 ++++++++++ gdb/testsuite/gdb.ada/overload_menu_crash/pck.adb | 21 ++++++++++ gdb/testsuite/gdb.ada/overload_menu_crash/pck.ads | 22 +++++++++++ 5 files changed, 114 insertions(+), 3 deletions(-) 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 *str= eam, const char *name, =20 /* 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 *varstri= ng, /* An __XVL field is not truly a pointer, so don't print "access" in this case. */ if (type->code () !=3D TYPE_CODE_PTR - || strstr (varstring, "___XVL") =3D=3D nullptr) + || (varstring !=3D nullptr + && strstr (varstring, "___XVL") =3D=3D 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}] !=3D ""} { + 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 =3D access boolean" "choose from menu" diff --git a/gdb/testsuite/gdb.ada/overload_menu_crash/main.adb b/gdb/tests= uite/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 :=3D Pck.Regtest (null); -- BREAK +end Main; diff --git a/gdb/testsuite/gdb.ada/overload_menu_crash/pck.adb b/gdb/testsu= ite/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/testsu= ite/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;