From 2c2316c5fd2bf6310c21c1c88a940be8494d1870 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 20 Oct 2022 10:55:35 -0600 Subject: [PATCH] Fix crash in ada_print_type 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; -- 2.30.2