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

Change SizedPrefixed verifier to be <= provided size (#7957)

Browse Source 
* Change SizedPrefixed verifier to be <= provided size

* add GetSizePrefixedBufferLength()
This commit is contained in:
Derek Bailey
2023-05-11 12:21:50 -07:00
committed by GitHub
parent 66e9d9823a
commit 33212657ae
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/monster_test.cpp
View File

@@ -3,7 +3,9 @@
#include <limits>
#include <vector>
#include "flatbuffers/base.h"
#include "flatbuffers/flatbuffer_builder.h"
#include "flatbuffers/flatbuffers.h"
#include "flatbuffers/idl.h"
#include "flatbuffers/registry.h"
#include "flatbuffers/verifier.h"
@@ -422,8 +424,8 @@ void MutateFlatBuffersTest(uint8_t *flatbuf, std::size_t length) {
// Mutate structs.
auto pos = monster->mutable_pos();
auto & test3 = pos->mutable_test3(); // Struct inside a struct.
test3.mutate_a(50); // Struct fields never fail.
auto &test3 = pos->mutable_test3(); // Struct inside a struct.
test3.mutate_a(50); // Struct fields never fail.
TEST_EQ(test3.a(), 50);
test3.mutate_a(10);
@@ -441,13 +443,12 @@ void MutateFlatBuffersTest(uint8_t *flatbuf, std::size_t length) {
first->mutate_hp(1000);
// Test for each loop over mutable entries
for (auto item: *tables)
{
for (auto item : *tables) {
TEST_EQ(item->hp(), 1000);
item->mutate_hp(0);
TEST_EQ(item->hp(), 0);
item->mutate_hp(1000);
break; // one iteration is enough, just testing compilation
break; // one iteration is enough, just testing compilation
}
// Mutate via LookupByKey
@@ -579,11 +580,31 @@ void SizePrefixedTest() {
flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize());
TEST_EQ(VerifySizePrefixedMonsterBuffer(verifier), true);
// The prefixed size doesn't include itself, so substract the size of the
// prefix
TEST_EQ(GetPrefixedSize(fbb.GetBufferPointer()),
fbb.GetSize() - sizeof(uoffset_t));
// Getting the buffer length does include the prefix size, so it should be the
// full lenght.
TEST_EQ(GetSizePrefixedBufferLength(fbb.GetBufferPointer()), fbb.GetSize());
// Access it.
auto m = GetSizePrefixedMonster(fbb.GetBufferPointer());
TEST_EQ(m->mana(), 200);
TEST_EQ(m->hp(), 300);
TEST_EQ_STR(m->name()->c_str(), "bob");
{
// Verify that passing a larger size is OK, but not a smaller
flatbuffers::Verifier verifier_larger(fbb.GetBufferPointer(),
fbb.GetSize() + 10);
TEST_EQ(VerifySizePrefixedMonsterBuffer(verifier_larger), true);
flatbuffers::Verifier verifier_smaller(fbb.GetBufferPointer(),
fbb.GetSize() - 10);
TEST_EQ(VerifySizePrefixedMonsterBuffer(verifier_smaller), false);
}
}
void TestMonsterExtraFloats(const std::string &tests_data_path) {