Add test for nested buffer verifier (#7252)
* Add test for nested buffer verifier
* switch to base API
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10c393a..4f497d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -342,7 +342,7 @@
/WX
/wd4512 # C4512: assignment operator could not be generated
/wd4316 # C4316: object allocated on the heap may not be aligned
-
+ /wd4456 # C4456: hides previous local declaration
$<$<CXX_COMPILER_ID:CLANG>:
/D_CRT_SECURE_NO_WARNINGS
>
@@ -359,7 +359,6 @@
-Wold-style-cast
-Wimplicit-fallthrough
-Wextra-semi
- -Werror=shadow
-fsigned-char
-Wnon-virtual-dtor
diff --git a/tests/test.cpp b/tests/test.cpp
index 497f3dd..aea3b4b 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -150,7 +150,7 @@
#endif
// Make sure the template deduces an initializer as std::vector<std::string>
- builder.CreateVectorOfStrings({"hello", "world"});
+ builder.CreateVectorOfStrings({ "hello", "world" });
// Create many vectors of strings
std::vector<std::string> manyNames;
@@ -227,7 +227,7 @@
FinishMonsterBuffer(builder, mloc);
-// clang-format off
+ // clang-format off
#ifdef FLATBUFFERS_TEST_VERBOSE
// print byte data for debugging:
auto p = builder.GetBufferPointer();
@@ -253,7 +253,7 @@
verifier.SetFlexReuseTracker(&flex_reuse_tracker);
TEST_EQ(VerifyMonsterBuffer(verifier), true);
-// clang-format off
+ // clang-format off
#ifdef FLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE
std::vector<uint8_t> test_buff;
test_buff.resize(length * 2);
@@ -634,7 +634,7 @@
}
void TriviallyCopyableTest() {
-// clang-format off
+ // clang-format off
#if __GNUG__ && __GNUC__ < 5
TEST_EQ(__has_trivial_copy(Vec3), true);
#else
@@ -1615,7 +1615,7 @@
}
};
-// clang-format off
+ // clang-format off
#define AddToSchemaAndInstances(schema_add, instance_add) \
RndDef::Add(definitions, schema, instances_per_definition, \
schema_add, instance_add, definition)
@@ -1769,7 +1769,7 @@
TEST_NOTNULL(nullptr); //-V501 (this comment supresses CWE-570 warning)
}
-// clang-format off
+ // clang-format off
#ifdef FLATBUFFERS_TEST_VERBOSE
TEST_OUTPUT_LINE("%dk schema tested with %dk of json\n",
static_cast<int>(schema.length() / 1024),
@@ -3161,7 +3161,7 @@
});
slb.Finish();
-// clang-format off
+ // clang-format off
#ifdef FLATBUFFERS_TEST_VERBOSE
for (size_t i = 0; i < slb.GetBuffer().size(); i++)
printf("%d ", slb.GetBuffer().data()[i]);
@@ -4179,6 +4179,63 @@
#endif
}
+void NestedVerifierTest() {
+ // Create a nested monster.
+ flatbuffers::FlatBufferBuilder nested_builder;
+ FinishMonsterBuffer(
+ nested_builder,
+ CreateMonster(nested_builder, nullptr, 0, 0,
+ nested_builder.CreateString("NestedMonster")));
+
+ // Verify the nested monster
+ flatbuffers::Verifier verifier(nested_builder.GetBufferPointer(),
+ nested_builder.GetSize());
+ TEST_EQ(true, VerifyMonsterBuffer(verifier));
+
+ {
+ // Create the outer monster.
+ flatbuffers::FlatBufferBuilder builder;
+
+ // Add the nested monster as a vector of bytes.
+ auto nested_monster_bytes = builder.CreateVector(
+ nested_builder.GetBufferPointer(), nested_builder.GetSize());
+
+ auto name = builder.CreateString("OuterMonster");
+
+ MonsterBuilder mon_builder(builder);
+ mon_builder.add_name(name);
+ mon_builder.add_testnestedflatbuffer(nested_monster_bytes);
+ FinishMonsterBuffer(builder, mon_builder.Finish());
+
+ // Verify the root monster, which includes verifing the nested monster
+ flatbuffers::Verifier verifier(builder.GetBufferPointer(),
+ builder.GetSize());
+ TEST_EQ(true, VerifyMonsterBuffer(verifier));
+ }
+
+ {
+ // Create the outer monster.
+ flatbuffers::FlatBufferBuilder builder;
+
+ // Purposely invalidate the nested flatbuffer setting its length to 1, an
+ // invalid length.
+ uint8_t invalid_nested_buffer[1];
+ auto nested_monster_bytes = builder.CreateVector(invalid_nested_buffer, 1);
+
+ auto name = builder.CreateString("OuterMonster");
+
+ MonsterBuilder mon_builder(builder);
+ mon_builder.add_name(name);
+ mon_builder.add_testnestedflatbuffer(nested_monster_bytes);
+ FinishMonsterBuffer(builder, mon_builder.Finish());
+
+ // Verify the root monster fails, since the included nested monster fails.
+ flatbuffers::Verifier verifier(builder.GetBufferPointer(),
+ builder.GetSize());
+ TEST_EQ(false, VerifyMonsterBuffer(verifier));
+ }
+}
+
void ParseIncorrectMonsterJsonTest() {
std::string schemafile;
TEST_EQ(flatbuffers::LoadFile((test_data_path + "monster_test.bfbs").c_str(),
@@ -4364,6 +4421,7 @@
FixedLengthArraySpanTest();
StructUnionTest();
WarningsAsErrorsTest();
+ NestedVerifierTest();
return 0;
}
