BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-27 21:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

monster fuzzer fix for json default scalars

Browse Source
This commit is contained in:
Derek Bailey
2022-03-30 12:29:41 -07:00
parent fec1a8d015
commit 2d21853a7e
1 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
tests/fuzzer/flatbuffers_monster_fuzzer.cc
View File

@@ -23,6 +23,7 @@
#include "cpp17/generated_cpp17/monster_test_generated.h" #include "cpp17/generated_cpp17/monster_test_generated.h"
#include "flatbuffers/idl.h" #include "flatbuffers/idl.h"
#include "test_assert.h"
#include "test_init.h" #include "test_init.h"
namespace fs = std::filesystem; namespace fs = std::filesystem;
@@ -32,6 +33,8 @@ OneTimeTestInit OneTimeTestInit::one_time_init_;
// The current executable path (see LLVMFuzzerInitialize). // The current executable path (see LLVMFuzzerInitialize).
static fs::path exe_path_; static fs::path exe_path_;
static flatbuffers::Parser parser_;
namespace { namespace {
static constexpr size_t kMinInputLength = 1; static constexpr size_t kMinInputLength = 1;
@@ -46,7 +49,8 @@ bool TestFileExists(fs::path file_path) {
TEST_OUTPUT_LINE("@DEBUG: file '%s' not found", file_path.string().c_str()); TEST_OUTPUT_LINE("@DEBUG: file '%s' not found", file_path.string().c_str());
for (const auto &entry : fs::directory_iterator(file_path.parent_path())) { for (const auto &entry : fs::directory_iterator(file_path.parent_path())) {
TEST_OUTPUT_LINE("@DEBUG: parent path entry: '%s'", entry.path().string().c_str()); TEST_OUTPUT_LINE("@DEBUG: parent path entry: '%s'",
entry.path().string().c_str());
} }
return false; return false;
} }
@@ -55,7 +59,8 @@ std::string LoadBinarySchema(const char *file_name) {
const auto file_path = exe_path_.parent_path() / file_name; const auto file_path = exe_path_.parent_path() / file_name;
TEST_EQ(true, TestFileExists(file_path)); TEST_EQ(true, TestFileExists(file_path));
std::string schemafile; std::string schemafile;
TEST_EQ(true, flatbuffers::LoadFile(file_path.string().c_str(), true, &schemafile)); TEST_EQ(true,
flatbuffers::LoadFile(file_path.string().c_str(), true, &schemafile));
flatbuffers::Verifier verifier( flatbuffers::Verifier verifier(
reinterpret_cast<const uint8_t *>(schemafile.c_str()), schemafile.size()); reinterpret_cast<const uint8_t *>(schemafile.c_str()), schemafile.size());
@@ -65,26 +70,19 @@ std::string LoadBinarySchema(const char *file_name) {
std::string do_test(const flatbuffers::IDLOptions &opts, std::string do_test(const flatbuffers::IDLOptions &opts,
const std::string input_json, const bool check_parser) { const std::string input_json, const bool check_parser) {
// once loaded from disk
static const std::string schemafile = LoadBinarySchema("monster_test.bfbs");
// parse schema first, so we can use it to parse the data after
flatbuffers::Parser parser;
TEST_EQ(true, parser.Deserialize(
reinterpret_cast<const uint8_t *>(schemafile.c_str()),
schemafile.size()));
// (re)define parser options // (re)define parser options
parser.opts = opts; parser_.opts = opts;
std::string jsongen; std::string jsongen;
if (parser.ParseJson(input_json.c_str())) { if (parser_.ParseJson(input_json.c_str())) {
flatbuffers::Verifier verifier(parser.builder_.GetBufferPointer(), flatbuffers::Verifier verifier(parser_.builder_.GetBufferPointer(),
parser.builder_.GetSize()); parser_.builder_.GetSize());
TEST_EQ(true, MyGame::Example::VerifyMonsterBuffer(verifier)); TEST_EQ(true, MyGame::Example::VerifyMonsterBuffer(verifier));
TEST_ASSERT( TEST_ASSERT(
GenerateText(parser, parser.builder_.GetBufferPointer(), &jsongen)); GenerateText(parser_, parser_.builder_.GetBufferPointer(), &jsongen));
} else if (check_parser) { } else if (check_parser) {
TEST_OUTPUT_LINE("parser failed with JSON:\n%s", input_json.c_str()); TEST_OUTPUT_LINE("parser failed with JSON:\n%s", input_json.c_str());
TEST_EQ_STR("", parser.error_.c_str()); TEST_EQ_STR("", parser_.error_.c_str());
TEST_ASSERT(false); TEST_ASSERT(false);
} }
return jsongen; return jsongen;
@@ -100,6 +98,11 @@ std::string do_test(const flatbuffers::IDLOptions &opts,
extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) {
(void)argc; (void)argc;
exe_path_ = (*argv)[0]; exe_path_ = (*argv)[0];
static const std::string schemafile = LoadBinarySchema("monster_test.bfbs");
// parse schema first, so we can use it to parse the data after
parser_.Deserialize(reinterpret_cast<const uint8_t *>(schemafile.c_str()),
schemafile.size());
return 0; return 0;
} }
@@ -122,10 +125,20 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
(flags & flags_skip_unexpected_fields_in_json); (flags & flags_skip_unexpected_fields_in_json);
opts.allow_non_utf8 = (flags & flags_allow_non_utf8); opts.allow_non_utf8 = (flags & flags_allow_non_utf8);
const std::string jsongen_1 = do_test(opts, input, false); do {
if (!jsongen_1.empty()) { const std::string jsongen_1 = do_test(opts, input, false);
const std::string jsongen_2 = do_test(opts, jsongen_1, true); if (!jsongen_1.empty()) {
TEST_EQ(jsongen_1, jsongen_2); const std::string jsongen_2 = do_test(opts, jsongen_1, true);
} if (jsongen_1 != jsongen_2 && !opts.output_default_scalars_in_json) {
// This gets tricky when the jsongen_1 includes a default-value, as the
// generated jsongen_2 doesn't emit default-values. So enable default
// scalars and re-run it.
opts.output_default_scalars_in_json = true;
continue;
}
TEST_EQ(jsongen_1, jsongen_2);
}
} while (0);
return 0; return 0;
} }