diff options
| author | Marek Polacek <polacek@redhat.com> | 2020-09-16 09:27:29 -0400 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2020-09-16 15:29:49 -0400 |
| commit | 31dd5cd6344bfbbe122fb512993b128e11236d35 (patch) | |
| tree | 4e4ccd17c40a49f3f0ffcb0db94f3fc8b1eed84d /gcc/input.c | |
| parent | 8b75204b27cb2a296ac329d48918992b4053c61e (diff) | |
| download | gcc-31dd5cd6344bfbbe122fb512993b128e11236d35.zip gcc-31dd5cd6344bfbbe122fb512993b128e11236d35.tar.gz gcc-31dd5cd6344bfbbe122fb512993b128e11236d35.tar.bz2 | |
preprocessor: Fix ICE with too long line in fmtwarn [PR96935]
Here we ICE in char_span::subspan because the offset it gets is -1.
It's -1 because get_substring_ranges_for_loc gets a location whose
column was 0. That only happens in testcases like the attached where
we're dealing with extremely long lines (at least 4065 chars it seems).
This does happen in practice, though, so it's not just a theoretical
problem (e.g. when building the SU2 suite).
Fixed by checking that the column get_substring_ranges_for_loc gets is
sane, akin to other checks in that function.
gcc/ChangeLog:
PR preprocessor/96935
* input.c (get_substring_ranges_for_loc): Return if start.column
is less than 1.
gcc/testsuite/ChangeLog:
PR preprocessor/96935
* gcc.dg/format/pr96935.c: New test.
Diffstat (limited to 'gcc/input.c')
| -rw-r--r-- | gcc/input.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/input.c b/gcc/input.c index d573b90..29d10f0 100644 --- a/gcc/input.c +++ b/gcc/input.c @@ -1461,6 +1461,8 @@ get_substring_ranges_for_loc (cpp_reader *pfile, size_t literal_length = finish.column - start.column + 1; /* Ensure that we don't crash if we got the wrong location. */ + if (start.column < 1) + return "zero start column"; if (line.length () < (start.column - 1 + literal_length)) return "line is not wide enough"; |