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

Fixed required field checking incorrectly using unsigned offsets.

Browse Source 
Reported by: https://github.com/google/flatbuffers/issues/99

Change-Id: Ia26da95bbac189836c257fa85f3bec1b153b6207
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2014-11-07 14:36:49 -08:00
parent 118abc2871
commit 8ef6ee2a3e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/flatbuffers/flatbuffers.h
View File

@@ -515,7 +515,7 @@ class FlatBufferBuilder {
uoffset_t EndTable(uoffset_t start, voffset_t numfields) { uoffset_t EndTable(uoffset_t start, voffset_t numfields) {
// Write the vtable offset, which is the start of any Table. // Write the vtable offset, which is the start of any Table.
// We fill it's value later. // We fill it's value later.
auto vtableoffsetloc = PushElement<uoffset_t>(0); auto vtableoffsetloc = PushElement<soffset_t>(0);
// Write a vtable, which consists entirely of voffset_t elements. // Write a vtable, which consists entirely of voffset_t elements.
// It starts with the number of offsets, followed by a type id, followed // It starts with the number of offsets, followed by a type id, followed
// by the offsets themselves. In reverse: // by the offsets themselves. In reverse:
@@ -564,7 +564,7 @@ class FlatBufferBuilder {
// just been constructed. // just been constructed.
template<typename T> void Required(Offset<T> table, voffset_t field) { template<typename T> void Required(Offset<T> table, voffset_t field) {
auto table_ptr = buf_.data_at(table.o); auto table_ptr = buf_.data_at(table.o);
auto vtable_ptr = table_ptr - ReadScalar<uoffset_t>(table_ptr); auto vtable_ptr = table_ptr - ReadScalar<soffset_t>(table_ptr);
bool ok = ReadScalar<voffset_t>(vtable_ptr + field) != 0; bool ok = ReadScalar<voffset_t>(vtable_ptr + field) != 0;
// If this fails, the caller will show what field needs to be set. // If this fails, the caller will show what field needs to be set.
assert(ok); assert(ok);