From 521c94471ae2f044f8cca8025bfa8db2d2936aea Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 31 Aug 2021 23:05:46 +0200 Subject: [PATCH 1/2] Harden 'gcc/input.c:string_concat_db::get_key_loc' We're using 'UNKNOWN_LOCATION' as a spare value for 'Empty', so should ascertain that we don't use it as a key additionally. Follow-up to r239175 (commit 88fa5555a309e5d6c6171b957daaf2f800920869) "On-demand locations within string-literals". gcc/ * input.c (string_concat_db::get_key_loc): Harden. --- gcc/input.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc/input.c b/gcc/input.c index 4b809862e02..98b8bb64618 100644 --- a/gcc/input.c +++ b/gcc/input.c @@ -1483,6 +1483,9 @@ string_concat_db::get_key_loc (location_t loc) loc = get_range_from_loc (line_table, loc).m_start; + /* Ascertain that 'loc' is valid as a key in 'm_table'. */ + gcc_checking_assert (!RESERVED_LOCATION_P (loc)); + return loc; } -- 2.33.0