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

Fix FlexBuffers writing incomplete length for 64-bit vectors.

This commit is contained in:
Wouter van Oortmerssen 2017-04-19 17:41:53 -07:00
parent ba20d9bff3
commit 340d1a3447
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/flatbuffers/flexbuffers.h
View File

@ -1088,8 +1088,8 @@ class Builder FLATBUFFERS_FINAL_CLASS {
reinterpret_cast<const uint8_t *>(val) + size); reinterpret_cast<const uint8_t *>(val) + size);
} }
// For values T >= byte_width
template<typename T> void Write(T val, size_t byte_width) { template<typename T> void Write(T val, size_t byte_width) {
assert(sizeof(T) >= byte_width);
val = flatbuffers::EndianScalar(val); val = flatbuffers::EndianScalar(val);
WriteBytes(&val, byte_width); WriteBytes(&val, byte_width);
} }
@ -1239,7 +1239,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
// TODO: instead of asserting, could write vector with larger elements // TODO: instead of asserting, could write vector with larger elements
// instead, though that would be wasteful. // instead, though that would be wasteful.
assert(WidthU(len) <= bit_width); assert(WidthU(len) <= bit_width);
if (!fixed) Write(len, byte_width); if (!fixed) Write<uint64_t>(len, byte_width);
auto vloc = buf_.size(); auto vloc = buf_.size();
for (size_t i = 0; i < len; i++) Write(elems[i], byte_width); for (size_t i = 0; i < len; i++) Write(elems[i], byte_width);
stack_.push_back(Value(static_cast<uint64_t>(vloc), stack_.push_back(Value(static_cast<uint64_t>(vloc),
@ -1281,9 +1281,9 @@ class Builder FLATBUFFERS_FINAL_CLASS {
// Write vector. First the keys width/offset if available, and size. // Write vector. First the keys width/offset if available, and size.
if (keys) { if (keys) {
WriteOffset(keys->u_, byte_width); WriteOffset(keys->u_, byte_width);
Write(1U << keys->min_bit_width_, byte_width); Write<uint64_t>(1U << keys->min_bit_width_, byte_width);
} }
if (!fixed) Write(vec_len, byte_width); if (!fixed) Write<uint64_t>(vec_len, byte_width);
// Then the actual data. // Then the actual data.
auto vloc = buf_.size(); auto vloc = buf_.size();
for (size_t i = start; i < stack_.size(); i += step) { for (size_t i = start; i < stack_.size(); i += step) {