Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

[gdb/ada] Fix literal truncation

Browse Source 
Make sure we error out on overflow instead of truncating in all cases.

Tested on x86_64-linux, with a build with --enable-targets=all.
This commit is contained in:
Tom de Vries
2022-06-04 13:17:33 +02:00
parent 999f7adc21
commit ac3afe36d7
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gdb/ada-lex.l
View File

@@ -466,12 +466,16 @@ processInt (struct parser_state *par_state, const char *base0,
if (mpz_cmp (result.val, maxval.val) > 0) if (mpz_cmp (result.val, maxval.val) > 0)
error (_("Integer literal out of range")); error (_("Integer literal out of range"));
int int_bits = gdbarch_int_bit (par_state->gdbarch ());
int long_bits = gdbarch_long_bit (par_state->gdbarch ());
int long_long_bits = gdbarch_long_long_bit (par_state->gdbarch ());
ULONGEST value = result.as_integer<ULONGEST> (); ULONGEST value = result.as_integer<ULONGEST> ();
if ((value >> (gdbarch_int_bit (par_state->gdbarch ())-1)) == 0) if (fits_in_type (1, value, int_bits, true))
yylval.typed_val.type = type_int (par_state); yylval.typed_val.type = type_int (par_state);
else if ((value >> (gdbarch_long_bit (par_state->gdbarch ())-1)) == 0) else if (fits_in_type (1, value, long_bits, true))
yylval.typed_val.type = type_long (par_state); yylval.typed_val.type = type_long (par_state);
else if (((value >> (gdbarch_long_bit (par_state->gdbarch ())-1)) >> 1) == 0) else if (fits_in_type (1, value, long_bits, false))
{ {
/* We have a number representable as an unsigned integer quantity. /* We have a number representable as an unsigned integer quantity.
For consistency with the C treatment, we will treat it as an For consistency with the C treatment, we will treat it as an
@@ -490,8 +494,23 @@ processInt (struct parser_state *par_state, const char *base0,
yylval.typed_val.val = (LONGEST) value; yylval.typed_val.val = (LONGEST) value;
return INT; return INT;
} }
else else if (fits_in_type (1, value, long_long_bits, true))
yylval.typed_val.type = type_long_long (par_state); yylval.typed_val.type = type_long_long (par_state);
else if (fits_in_type (1, value, long_long_bits, false))
{
/* Note: Interprets ULLONG_MAX as -1. */
yylval.typed_val.type = type_long_long (par_state);
/* See unsigned long case above. */
if (value & LONGEST_SIGN)
yylval.typed_val.val =
(LONGEST) (value & ~LONGEST_SIGN)
- (LONGEST_SIGN>>1) - (LONGEST_SIGN>>1);
else
yylval.typed_val.val = (LONGEST) value;
return INT;
}
else
error (_("Integer literal out of range"));
yylval.typed_val.val = value; yylval.typed_val.val = value;
return INT; return INT;

4
gdb/testsuite/gdb.base/parse_number.exp
View File

@@ -146,9 +146,7 @@ proc parse_number { lang n } {
return [list "<$sizeof_long_long-byte integer>" $n] return [list "<$sizeof_long_long-byte integer>" $n]
} else { } else {
# Overflow. # Overflow.
# Some truncated value or re_overflow, should be re_overflow. return [list $re_overflow $re_overflow]
return [list "($re_overflow|<$decimal-byte integer>)" \
($re_overflow|$any)]
} }
} elseif { $lang == "modula-2" } { } elseif { $lang == "modula-2" } {
if { [string equal $n -0] } { if { [string equal $n -0] } {