diff options
| author | Keith Winstein <keithw@cs.stanford.edu> | 2023-02-25 12:41:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-25 20:41:25 +0000 |
| commit | 3d9ec159cb362d71cf76938d583841975b3e730a (patch) | |
| tree | 7dfccf73cdda17b81b1c3a1ced77b9479920049b | |
| parent | 6a11a5bf6d4f576431b38b72e9f30e5b426d21bb (diff) | |
| download | wabt-3d9ec159cb362d71cf76938d583841975b3e730a.tar.gz wabt-3d9ec159cb362d71cf76938d583841975b3e730a.tar.bz2 wabt-3d9ec159cb362d71cf76938d583841975b3e730a.zip | |
Improve lexing of invalid annotations (#2150)
This had been crashing even with annotations disabled.
Adds a regression test.
This was missed in #2001 when updating the lexer to match
the updated spec (WebAssembly/spec#1499).
Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=53935
| -rw-r--r-- | src/wast-lexer.cc | 2 | ||||
| -rw-r--r-- | test/regress/bad-annotation.txt | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/wast-lexer.cc b/src/wast-lexer.cc index cc3d2751..dbdee9aa 100644 --- a/src/wast-lexer.cc +++ b/src/wast-lexer.cc @@ -70,7 +70,7 @@ Token WastLexer::GetToken() { } return BareToken(TokenType::Eof); } else if (MatchString("(@")) { - ReadReservedChars(); + GetIdToken(); // offset=2 to skip the "(@" prefix return TextToken(TokenType::LparAnn, 2); } else { diff --git a/test/regress/bad-annotation.txt b/test/regress/bad-annotation.txt new file mode 100644 index 00000000..c3a3b0bf --- /dev/null +++ b/test/regress/bad-annotation.txt @@ -0,0 +1,12 @@ +;;; TOOL: wat2wasm +;;; ERROR: 1 +(@"annotation + +(;; STDERR ;;; +out/test/regress/bad-annotation.txt:3:1: error: annotations not enabled: "annotation +(@"annotation +^^^^^^^^^^^^^ +out/test/regress/bad-annotation.txt:3:1: error: unexpected token "Invalid", expected a module field or a module. +(@"annotation +^^^^^^^^^^^^^ +;;; STDERR ;;) |