Rooba
/
flatbuffers
mirror of https://github.com/google/flatbuffers.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wrap verify file id condition in Check call (#6085) 

Run clang-format

Update testcase
This commit is contained in:
Navin Mohan 2020-09-01 00:02:13 +05:30 committed by GitHub
parent 49f4948f06
commit bb25956f09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/flatbuffers/flatbuffers.h
View File

@ -2274,8 +2274,8 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
template<typename T> template<typename T>
bool VerifyBufferFromStart(const char *identifier, size_t start) { bool VerifyBufferFromStart(const char *identifier, size_t start) {
if (identifier && (size_ < 2 * sizeof(flatbuffers::uoffset_t) || if (identifier && !Check((size_ >= 2 * sizeof(flatbuffers::uoffset_t) &&
!BufferHasIdentifier(buf_ + start, identifier))) { BufferHasIdentifier(buf_ + start, identifier)))) {
return false; return false;
} }

2
tests/test.cpp
View File

@ -3218,7 +3218,7 @@ void FixedLengthArrayTest() {
aStruct.mutable_d()->Mutate(0, nStruct0); aStruct.mutable_d()->Mutate(0, nStruct0);
aStruct.mutable_d()->Mutate(1, nStruct1); aStruct.mutable_d()->Mutate(1, nStruct1);
auto aTable = MyGame::Example::CreateArrayTable(fbb, &aStruct); auto aTable = MyGame::Example::CreateArrayTable(fbb, &aStruct);
fbb.Finish(aTable); MyGame::Example::FinishArrayTableBuffer(fbb, aTable);
// Verify correctness of the ArrayTable. // Verify correctness of the ArrayTable.
flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize()); flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize());