diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-02-05 20:39:48 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-02-05 20:39:48 +0100 |
| commit | b5c1c988528a8761d802e923fe0a94160810c732 (patch) | |
| tree | 25ec72b899a14342869ac614655061632af0f850 | |
| parent | 0fd9d4921f7ba2fc910078dd5271da6e8e1c9e85 (diff) | |
| download | gcc-b5c1c988528a8761d802e923fe0a94160810c732.zip gcc-b5c1c988528a8761d802e923fe0a94160810c732.tar.gz gcc-b5c1c988528a8761d802e923fe0a94160810c732.tar.bz2 | |
re PR c++/69628 (Conditional jump or move depends on uninitialised value(s) in lex_charconst(cpp_token const*) (c-lex.c:1252))
PR c++/69628
* charset.c (cpp_interpret_charconst): Clear *PCHARS_SEEN
and *UNSIGNEDP if bailing out early due to errors.
* g++.dg/parse/pr69628.C: New test.
From-SVN: r233186
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/pr69628.C | 5 | ||||
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/charset.c | 11 |
4 files changed, 25 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1f9bf5d..7876eda 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-02-05 Jakub Jelinek <jakub@redhat.com> + + PR c++/69628 + * g++.dg/parse/pr69628.C: New test. + 2016-02-05 Uros Bizjak <ubizjak@gmail.com> * gcc.dg/sancov/asan.c: Move to ... diff --git a/gcc/testsuite/g++.dg/parse/pr69628.C b/gcc/testsuite/g++.dg/parse/pr69628.C new file mode 100644 index 0000000..0bbd08b --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/pr69628.C @@ -0,0 +1,5 @@ +// PR c++/69628 +// { dg-do compile } + +0''; // { dg-error "empty character constant" } +// { dg-error "expected unqualified-id before numeric constant" "" { target *-*-* } 4 } diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 10d7197..385b965 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2016-02-05 Jakub Jelinek <jakub@redhat.com> + + PR c++/69628 + * charset.c (cpp_interpret_charconst): Clear *PCHARS_SEEN + and *UNSIGNEDP if bailing out early due to errors. + 2016-01-28 Jakub Jelinek <jakub@redhat.com> PR pch/68176 diff --git a/libcpp/charset.c b/libcpp/charset.c index 60cbde6..2d07942 100644 --- a/libcpp/charset.c +++ b/libcpp/charset.c @@ -1620,10 +1620,17 @@ cpp_interpret_charconst (cpp_reader *pfile, const cpp_token *token, if (token->val.str.len == (size_t) (2 + wide + u8)) { cpp_error (pfile, CPP_DL_ERROR, "empty character constant"); + *pchars_seen = 0; + *unsignedp = 0; + return 0; + } + else if (!cpp_interpret_string (pfile, &token->val.str, 1, &str, + token->type)) + { + *pchars_seen = 0; + *unsignedp = 0; return 0; } - else if (!cpp_interpret_string (pfile, &token->val.str, 1, &str, token->type)) - return 0; if (wide) result = wide_str_to_charconst (pfile, str, pchars_seen, unsignedp, |