KJ16609/gcc-reflection
1
0
Fork 0
mirror of https://forge.sourceware.org/marek/gcc.git synced 2026-02-22 03:47:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

libcpp: Fix ICE on directive inside _Pragma() operator [PR67046]

Browse Source 
get__Pragma_string() in directives.cc is responsible for lexing the parens
and the string argument from a _Pragma("...") operator. This function does
not handle the case when the closing paren is not on the same line as the
string; in that case, libcpp will by default reuse the token buffer it
previously used for the string, so that the string token returned by
get__Pragma_string() may be corrupted, as shown in the testcase. Fix using
the existing keep_tokens mechanism that temporarily disables the reuse of
token buffers.

libcpp/ChangeLog:

	PR preprocessor/67046
	* directives.cc (_cpp_do__Pragma): Increment pfile->keep_tokens to
	ensure the returned string token is valid.

gcc/testsuite/ChangeLog:

	PR preprocessor/67046
	* c-c++-common/cpp/pr67046.c: New test.
This commit is contained in:
Lewis Hyatt
2023-01-14 13:29:22 -05:00
parent 73dd5c6c88
commit 336ce497fb
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libcpp/directives.cc
View File

@@ -1996,7 +1996,12 @@ destringize_and_run (cpp_reader *pfile, const cpp_string *in,
int
_cpp_do__Pragma (cpp_reader *pfile, location_t expansion_loc)
{
/* Make sure we don't invalidate the string token, if the closing parenthesis
ended up on a different line. */
++pfile->keep_tokens;
const cpp_token *string = get__Pragma_string (pfile);
--pfile->keep_tokens;
pfile->directive_result.type = CPP_PADDING;
if (string)