From bb25956f09ea48dc31e85acf8447f1d5851fae2b Mon Sep 17 00:00:00 2001 From: Navin Mohan Date: Tue, 1 Sep 2020 00:02:13 +0530 Subject: [PATCH] Wrap verify file id condition in Check call (#6085) Run clang-format Update testcase --- include/flatbuffers/flatbuffers.h | 4 ++-- tests/test.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h index ca5c658..47d6f1b 100644 --- a/include/flatbuffers/flatbuffers.h +++ b/include/flatbuffers/flatbuffers.h @@ -2274,8 +2274,8 @@ class Verifier FLATBUFFERS_FINAL_CLASS { template bool VerifyBufferFromStart(const char *identifier, size_t start) { - if (identifier && (size_ < 2 * sizeof(flatbuffers::uoffset_t) || - !BufferHasIdentifier(buf_ + start, identifier))) { + if (identifier && !Check((size_ >= 2 * sizeof(flatbuffers::uoffset_t) && + BufferHasIdentifier(buf_ + start, identifier)))) { return false; } diff --git a/tests/test.cpp b/tests/test.cpp index 86f13d2..8701b6b 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -3218,7 +3218,7 @@ void FixedLengthArrayTest() { aStruct.mutable_d()->Mutate(0, nStruct0); aStruct.mutable_d()->Mutate(1, nStruct1); auto aTable = MyGame::Example::CreateArrayTable(fbb, &aStruct); - fbb.Finish(aTable); + MyGame::Example::FinishArrayTableBuffer(fbb, aTable); // Verify correctness of the ArrayTable. flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize()); -- 2.7.4