From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 09AD13838209; Sat, 4 Jun 2022 11:18:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09AD13838209 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/rust] Fix literal truncation X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 7af9baa9faead8155e4459104c30cb1b6a15180e X-Git-Newrev: 1390b65a1b93f75cdd4165f190b4a95b93add66e Message-Id: <20220604111804.09AD13838209@sourceware.org> Date: Sat, 4 Jun 2022 11:18:04 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2022 11:18:04 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1390b65a1b93= f75cdd4165f190b4a95b93add66e commit 1390b65a1b93f75cdd4165f190b4a95b93add66e Author: Tom de Vries Date: Sat Jun 4 13:17:33 2022 +0200 [gdb/rust] Fix literal truncation =20 Make sure we error out on overflow instead of truncating in all cases. =20 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. =20 Tested on x86_64-linux, with a build with --enable-targets=3Dall. Diff: --- 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 () } } =20 - value =3D strtoulst (number.c_str () + offset, NULL, radix); + const char *trailer; + value =3D strtoulst (number.c_str () + offset, &trailer, radix); + if (*trailer !=3D '\0') + error ("Integer literal is too large"); if (implicit_i32 && value >=3D ((uint64_t) 1) << 31) type =3D get_type ("i64"); =20 diff --git a/gdb/testsuite/gdb.base/parse_number.exp b/gdb/testsuite/gdb.ba= se/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 =3D=3D "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 =3D=3D "ada" } { set re_overflow "Integer literal out of range" + } elseif { $lang =3D=3D "rust" } { + set re_overflow "Integer literal is too large" } else { set re_overflow "Numeric constant too large\\." }