WastParser::ErrorExpected: ensure there is a token to consume (WebAss…

…embly#2247) Fixes assertion failure on empty quoted module
ludoplex · Jun 7, 2023 · aca6d6f · aca6d6f
1 parent e828331
commit aca6d6f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/wast-parser.cc b/src/wast-parser.cc
@@ -720,6 +720,7 @@ void WastParser::ErrorUnlessOpcodeEnabled(const Token& token) {
 
 Result WastParser::ErrorExpected(const std::vector<std::string>& expected,
                                  const char* example) {
+  GetToken();
   Token token = Consume();
   std::string expected_str;
   if (!expected.empty()) {
@@ -752,7 +753,6 @@ Result WastParser::ErrorExpected(const std::vector<std::string>& expected,
 Result WastParser::ErrorIfLpar(const std::vector<std::string>& expected,
                                const char* example) {
   if (Match(TokenType::Lpar)) {
-    GetToken();
     return ErrorExpected(expected, example);
   }
   return Result::Ok;

diff --git a/test/regress/empty-quoted-module.txt b/test/regress/empty-quoted-module.txt
@@ -0,0 +1,6 @@
+;;; TOOL: wat2wasm
+;;; ERROR: 1
+(module quote "")
+(;; STDERR ;;;
+out/test/regress/empty-quoted-module.txt:4:1: error: unexpected token "EOF", expected a binary module or a text module.
+;;; STDERR ;;)