OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reject fix-it hints for various awkward boundary cases (PR c/82050)

Browse Source 
PR c/82050 reports a failed assertion deep within diagnostic_show_locus's
code for printing fix-it hints.

The root cause is a fix-it hint suggesting a textual replacement,
where the affected column numbers straddle the LINE_MAP_MAX_COLUMN_NUMBER
boundary, so that the start of the range has a column number, but the
end of the range doesn't.

The fix is to verify that the column numbers are sane when adding fix-it
hints to a rich_location, rejecting fix-it hints where they are not.

libcpp/ChangeLog:
	PR c/82050
	* include/line-map.h (LINE_MAP_MAX_COLUMN_NUMBER): Move here.
	* line-map.c (LINE_MAP_MAX_COLUMN_NUMBER): ...from here.
	(rich_location::maybe_add_fixit): Reject fix-it hints in which
	the start column exceeds the next column.

From-SVN: r255214
This commit is contained in:
David Malcolm 2017-11-28 19:24:35 +00:00 committed by David Malcolm
parent e5cf5e116d
commit 6df8934f6a
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcpp/ChangeLog
View File

@ -1,3 +1,11 @@
2017-11-28 David Malcolm <dmalcolm@redhat.com>
PR c/82050
* include/line-map.h (LINE_MAP_MAX_COLUMN_NUMBER): Move here.
* line-map.c (LINE_MAP_MAX_COLUMN_NUMBER): ...from here.
(rich_location::maybe_add_fixit): Reject fix-it hints in which
the start column exceeds the next column.
2017-11-20 Eric Gallager <egall@gwmail.gwu.edu>
PR preprocessor/81794

5
libcpp/include/line-map.h
View File

@ -280,6 +280,11 @@ enum lc_reason
worked example in libcpp/location-example.txt. */
typedef unsigned int source_location;
/* Do not track column numbers higher than this one. As a result, the
range of column_bits is [12, 18] (or 0 if column numbers are
disabled). */
const unsigned int LINE_MAP_MAX_COLUMN_NUMBER = (1U << 12);
/* Do not pack ranges if locations get higher than this.
If you change this, update:
gcc.dg/plugin/location-overflow-test-*.c. */

13
libcpp/line-map.c
View File

@ -26,11 +26,6 @@ along with this program; see the file COPYING3. If not see
#include "internal.h"
#include "hashtab.h"
/* Do not track column numbers higher than this one. As a result, the
range of column_bits is [12, 18] (or 0 if column numbers are
disabled). */
const unsigned int LINE_MAP_MAX_COLUMN_NUMBER = (1U << 12);
/* Highest possible source location encoded within an ordinary or
macro map. */
const source_location LINE_MAP_MAX_SOURCE_LOCATION = 0x70000000;
@ -2352,6 +2347,14 @@ rich_location::maybe_add_fixit (source_location start,
stop_supporting_fixits ();
return;
}
/* The columns must be in the correct order. This can fail if the
endpoints straddle the boundary for which the linemap can represent
columns (PR c/82050). */
if (exploc_start.column > exploc_next_loc.column)
{
stop_supporting_fixits ();
return;
}
const char *newline = strchr (new_content, '\n');
if (newline)