diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-10-06 14:22:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-17 21:05:11 +0000 |
| commit | e148bf714e39ad006d82d99ed40f2ad1dfa6b905 (patch) | |
| tree | e20cd4884ddbd0389ae3523d5bdcb96a61a682af | |
| parent | 84366d22d6535dd955d9aa14bb0f364381c3f45d (diff) | |
fix for SkSL lexer crash on non-ASCII input
Bug: skia:7126
Change-Id: Ic884d14daf91fd668afe9e29d2f82d1ef1089cce
Reviewed-on: https://skia-review.googlesource.com/56720
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
| -rw-r--r-- | BUILD.gn | 3 | ||||
| -rw-r--r-- | src/sksl/SkSLLayoutLexer.cpp | 3 | ||||
| -rw-r--r-- | src/sksl/SkSLLexer.cpp | 3 | ||||
| -rw-r--r-- | src/sksl/lex/Main.cpp | 3 |
4 files changed, 12 insertions, 0 deletions
@@ -429,6 +429,9 @@ if (skia_lex) { action("run_sksllex") { script = "gn/run_sksllex.py" + deps = [ + ":sksllex(//gn/toolchain:$host_toolchain)", + ] sources = [ "src/sksl/lex/layout.lex", "src/sksl/lex/sksl.lex", diff --git a/src/sksl/SkSLLayoutLexer.cpp b/src/sksl/SkSLLayoutLexer.cpp index 27efa89d92..432095ab12 100644 --- a/src/sksl/SkSLLayoutLexer.cpp +++ b/src/sksl/SkSLLayoutLexer.cpp @@ -353,6 +353,9 @@ LayoutToken LayoutLexer::next() { LayoutToken::Kind lastAccept = LayoutToken::Kind::INVALID; int lastAcceptEnd = startOffset + 1; while (offset < fLength) { + if ((uint8_t) fText[offset] >= 127) { + break; + } state = transitions[mappings[(int)fText[offset]]][state]; ++offset; if (!state) { diff --git a/src/sksl/SkSLLexer.cpp b/src/sksl/SkSLLexer.cpp index 2b3d465cb3..c97ded924f 100644 --- a/src/sksl/SkSLLexer.cpp +++ b/src/sksl/SkSLLexer.cpp @@ -926,6 +926,9 @@ Token Lexer::next() { Token::Kind lastAccept = Token::Kind::INVALID; int lastAcceptEnd = startOffset + 1; while (offset < fLength) { + if ((uint8_t) fText[offset] >= 127) { + break; + } state = transitions[mappings[(int)fText[offset]]][state]; ++offset; if (!state) { diff --git a/src/sksl/lex/Main.cpp b/src/sksl/lex/Main.cpp index ff5d6619a1..fe06a874d3 100644 --- a/src/sksl/lex/Main.cpp +++ b/src/sksl/lex/Main.cpp @@ -141,6 +141,9 @@ void writeCPP(const DFA& dfa, const char* lexer, const char* token, const char* out << " " << token << "::Kind lastAccept = " << token << "::Kind::INVALID;\n"; out << " int lastAcceptEnd = startOffset + 1;\n"; out << " while (offset < fLength) {\n"; + out << " if ((uint8_t) fText[offset] >= " << dfa.fCharMappings.size() << ") {"; + out << " break;"; + out << " }"; out << " state = transitions[mappings[(int) fText[offset]]][state];\n"; out << " ++offset;\n"; out << " if (!state) {\n"; |