diff options
| author | Lewis Hyatt <lhyatt@gmail.com> | 2023-01-14 13:29:22 -0500 |
|---|---|---|
| committer | Lewis Hyatt <lhyatt@gmail.com> | 2023-03-13 07:40:50 -0400 |
| commit | 336ce497fb266268a79544f00dd3bbd24cf3a4d6 (patch) | |
| tree | 3762b202adc4ca0bb1ac761abf83fef2307e85ab /libcpp/directives.cc | |
| parent | 73dd5c6c887c8a5e849060cc8c9d03bdeeac6f72 (diff) | |
| download | gcc-336ce497fb266268a79544f00dd3bbd24cf3a4d6.zip gcc-336ce497fb266268a79544f00dd3bbd24cf3a4d6.tar.gz gcc-336ce497fb266268a79544f00dd3bbd24cf3a4d6.tar.bz2 | |
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.
Diffstat (limited to 'libcpp/directives.cc')
| -rw-r--r-- | libcpp/directives.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libcpp/directives.cc b/libcpp/directives.cc index 7f84b83..1fdd73e 100644 --- a/libcpp/directives.cc +++ b/libcpp/directives.cc @@ -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) |