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

Fixed ASan array out of bounds.

Browse Source 
Change-Id: I53366bd14548aa41c3d25bcd187d7436d47e8665
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2018-06-14 15:13:01 -07:00
parent b752e4a9bb
commit f9c64891dd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/idl_parser.cpp
View File

@@ -944,7 +944,7 @@ CheckedError Parser::ParseTableDelimiters(size_t &fieldn,
if ((!opts.strict_json || !fieldn) && Is(terminator)) break; if ((!opts.strict_json || !fieldn) && Is(terminator)) break;
std::string name; std::string name;
if (is_nested_vector) { if (is_nested_vector) {
if (fieldn > struct_def->fields.vec.size()) { if (fieldn >= struct_def->fields.vec.size()) {
return Error("too many unnamed fields in nested array"); return Error("too many unnamed fields in nested array");
} }
name = struct_def->fields.vec[fieldn]->name; name = struct_def->fields.vec[fieldn]->name;
@@ -1213,7 +1213,7 @@ CheckedError Parser::ParseNestedFlatbuffer(Value &val, FieldDef *field,
// Force alignment for nested flatbuffer // Force alignment for nested flatbuffer
builder_.ForceVectorAlignment(nested_parser.builder_.GetSize(), sizeof(uint8_t), builder_.ForceVectorAlignment(nested_parser.builder_.GetSize(), sizeof(uint8_t),
nested_parser.builder_.GetBufferMinAlignment()); nested_parser.builder_.GetBufferMinAlignment());
auto off = builder_.CreateVector(nested_parser.builder_.GetBufferPointer(), auto off = builder_.CreateVector(nested_parser.builder_.GetBufferPointer(),
nested_parser.builder_.GetSize()); nested_parser.builder_.GetSize());
val.constant = NumToString(off.o); val.constant = NumToString(off.o);