BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-01 19:43:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[idl_parser, JSON] Disable parsing of JSON for incomplete schemes (#6493)

Browse Source 
This commit disable JSON parsing for an incomplete scheme if JSON object is embedded into one file with the scheme.
This should improve the quality of OSS-Fuzz inputs for the parser_fuzzer target.
This commit is contained in:
Vladimir Glavnyy
2021-03-02 04:40:58 +07:00
committed by GitHub
parent bd4e0b30a7
commit 5319dedb1a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/idl_parser.cpp
View File

@@ -3189,6 +3189,9 @@ CheckedError Parser::ParseRoot(const char *source, const char **include_paths,
} }
} }
} }
// Parse JSON object only if the scheme has been parsed.
if (token_ == '{') { ECHECK(DoParseJson()); }
EXPECT(kTokenEof);
return NoError(); return NoError();
} }
@@ -3308,7 +3311,7 @@ CheckedError Parser::DoParse(const char *source, const char **include_paths,
} else if (IsIdent("namespace")) { } else if (IsIdent("namespace")) {
ECHECK(ParseNamespace()); ECHECK(ParseNamespace());
} else if (token_ == '{') { } else if (token_ == '{') {
ECHECK(DoParseJson()); return NoError();
} else if (IsIdent("enum")) { } else if (IsIdent("enum")) {
ECHECK(ParseEnum(false, nullptr)); ECHECK(ParseEnum(false, nullptr));
} else if (IsIdent("union")) { } else if (IsIdent("union")) {