Skip to content
Snippets Groups Projects
Commit 336ce497 authored by Lewis Hyatt's avatar Lewis Hyatt
Browse files

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

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.
parent 73dd5c6c
No related branches found
No related tags found
No related merge requests found
/* { dg-do preprocess } */
_Pragma(
"message(\"msg\")"
)
_Pragma(
"message(\"msg\")"
#
)
...@@ -1996,7 +1996,12 @@ destringize_and_run (cpp_reader *pfile, const cpp_string *in, ...@@ -1996,7 +1996,12 @@ destringize_and_run (cpp_reader *pfile, const cpp_string *in,
int int
_cpp_do__Pragma (cpp_reader *pfile, location_t expansion_loc) _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); const cpp_token *string = get__Pragma_string (pfile);
--pfile->keep_tokens;
pfile->directive_result.type = CPP_PADDING; pfile->directive_result.type = CPP_PADDING;
if (string) if (string)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment