From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by sourceware.org (Postfix) with ESMTPS id 101B63858001 for ; Thu, 17 Feb 2022 22:05:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 101B63858001 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id 7193B10047D71 for ; Thu, 17 Feb 2022 22:05:50 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KouLnRtJqEaNCKouMnNVdQ; Thu, 17 Feb 2022 22:05:50 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=fNX8YbWe c=1 sm=1 tr=0 ts=620ec6be a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=oGFeUVbbRNcA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=20KFwNOVAAAA:8 a=mDV3o1hIAAAA:8 a=vR5DERQXXc3ihHeaIVMA:9 a=_FVE-zBwftR9WsbkzFJk: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:References:In-Reply-To: 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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Rq44mGEPsl5ETk/kNhig44Lg1YbzVT51/Bx1R0HFhRk=; b=ByIZvpv0Y8fnbR6kJo56PD3Ifu ekTZKOrN6YsG/Ak2ZFCpxxzqmF+b8hte9hMzmo0XMCgbrYgGswNr7ooFH3nAvqDo82g6uzJrFVBPx 5AAXiBDCTPA87Ihh44Ydjx9Vb; Received: from 75-166-146-214.hlrn.qwest.net ([75.166.146.214]:41036 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nKouL-002A2c-Iu; Thu, 17 Feb 2022 15:05:49 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey , Andrew Burgess Subject: [PATCH v2 01/18] Fix latent quote char bug in generic_printstr Date: Thu, 17 Feb 2022 15:05:29 -0700 Message-Id: <20220217220547.3874030-2-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220217220547.3874030-1-tom@tromey.com> References: <20220217220547.3874030-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 75.166.146.214 X-Source-L: No X-Exim-ID: 1nKouL-002A2c-Iu X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-146-214.hlrn.qwest.net (prentzel.Home) [75.166.146.214]:41036 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3030.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Thu, 17 Feb 2022 22:05:52 -0000 generic_printstr prints an empty string like: fputs_filtered ("\"\"", stream); However, this seems wrong to me if the quote character is something other than double quote. This patch fixes this latent bug. Thanks to Andrew for the test case. Co-authored-by: Andrew Burgess --- gdb/testsuite/gdb.fortran/empty-string.exp | 33 ++++++++++++++++++++++ gdb/testsuite/gdb.fortran/empty-string.f90 | 30 ++++++++++++++++++++ gdb/valprint.c | 2 +- 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.fortran/empty-string.exp create mode 100644 gdb/testsuite/gdb.fortran/empty-string.f90 diff --git a/gdb/testsuite/gdb.fortran/empty-string.exp b/gdb/testsuite/gdb.fortran/empty-string.exp new file mode 100644 index 00000000000..892f189784a --- /dev/null +++ b/gdb/testsuite/gdb.fortran/empty-string.exp @@ -0,0 +1,33 @@ +# 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 . + +# Test printing of an empty Fortran string. + +if {[skip_fortran_tests]} { return -1 } + +standard_testfile ".f90" +load_lib fortran.exp + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { + return -1 +} + +if ![fortran_runto_main] { + return -1 +} + +gdb_breakpoint [gdb_get_line_number "Break here"] +gdb_continue_to_breakpoint "run to test location" +gdb_test "print string" " = ''" diff --git a/gdb/testsuite/gdb.fortran/empty-string.f90 b/gdb/testsuite/gdb.fortran/empty-string.f90 new file mode 100644 index 00000000000..574ed7fb7aa --- /dev/null +++ b/gdb/testsuite/gdb.fortran/empty-string.f90 @@ -0,0 +1,30 @@ +! 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 . + +program empty_string + implicit none + + integer :: ret + + ret = string_length('') + +contains + + integer(kind=4) function string_length(string) + character*(*) :: string + string_length = len(string) ! Break here. + end function string_length + +end program empty_string diff --git a/gdb/valprint.c b/gdb/valprint.c index d6ec64845f4..e4d68381189 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -2632,7 +2632,7 @@ generic_printstr (struct ui_file *stream, struct type *type, if (length == 0) { - fputs_filtered ("\"\"", stream); + fprintf_filtered (stream, "%c%c", quote_char, quote_char); return; } -- 2.31.1