From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 0C7D0383D81F for ; Mon, 23 May 2022 11:05:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0C7D0383D81F Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 390FA218E4 for ; Mon, 23 May 2022 11:05:19 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 25CBF13B2A for ; Mon, 23 May 2022 11:05:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QDoKCG9qi2JxFQAAMHmgww (envelope-from ) for ; Mon, 23 May 2022 11:05:19 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 6/8] [gdb/rust] Fix literal truncation Date: Mon, 23 May 2022 13:05:16 +0200 Message-Id: <20220523110518.2447-6-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220523110518.2447-1-tdevries@suse.de> References: <20220523110518.2447-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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-List-Received-Date: Mon, 23 May 2022 11:05:22 -0000 Make sure we error out on overflow instead of truncating in all cases. I've used as overflow string: "Integer literal is too large", based on what I found at /src/test/ui/parser/int-literal-too-large-span.rs but perhaps someone has a better idea. Tested on x86_64-linux, with a build with --enable-targets=all. --- gdb/rust-parse.c | 5 ++++- gdb/testsuite/gdb.base/parse_number.exp | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gdb/rust-parse.c b/gdb/rust-parse.c index 7d7d882872c..836f49108f8 100644 --- a/gdb/rust-parse.c +++ b/gdb/rust-parse.c @@ -1024,7 +1024,10 @@ rust_parser::lex_number () } } - value = strtoulst (number.c_str () + offset, NULL, radix); + const char *trailer; + value = strtoulst (number.c_str () + offset, &trailer, radix); + if (*trailer != '\0') + error ("Integer literal is too large"); if (implicit_i32 && value >= ((uint64_t) 1) << 31) type = get_type ("i64"); diff --git a/gdb/testsuite/gdb.base/parse_number.exp b/gdb/testsuite/gdb.base/parse_number.exp index f9782115b7c..4189ccaf92c 100644 --- a/gdb/testsuite/gdb.base/parse_number.exp +++ b/gdb/testsuite/gdb.base/parse_number.exp @@ -113,8 +113,7 @@ proc parse_number { lang n } { return [list "i64" $n] } else { # Overflow. - # Some truncated value, should be re_overflow. - return [list i64 $any] + return [list $re_overflow $re_overflow] } } elseif { $lang == "d" } { if { [fits_in_type $n 32 s] } { @@ -274,6 +273,8 @@ proc test_parse_numbers {arch} { set re_overflow "Overflow on numeric constant\\." } elseif { $lang == "ada" } { set re_overflow "Integer literal out of range" + } elseif { $lang == "rust" } { + set re_overflow "Integer literal is too large" } else { set re_overflow "Numeric constant too large\\." } -- 2.35.3