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

Make alignment checking optional. (#5011)

Browse Source
This commit is contained in:
Doug Muir
2018-10-22 16:14:44 -07:00
committed by Wouter van Oortmerssen
parent ca417426c7
commit ff687ae9c1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/flatbuffers/flatbuffers.h
View File

@@ -1901,7 +1901,7 @@ inline bool BufferHasIdentifier(const void *buf, const char *identifier, bool si
class Verifier FLATBUFFERS_FINAL_CLASS { class Verifier FLATBUFFERS_FINAL_CLASS {
public: public:
Verifier(const uint8_t *buf, size_t buf_len, uoffset_t _max_depth = 64, Verifier(const uint8_t *buf, size_t buf_len, uoffset_t _max_depth = 64,
uoffset_t _max_tables = 1000000) uoffset_t _max_tables = 1000000, bool _check_alignment = true)
: buf_(buf), : buf_(buf),
size_(buf_len), size_(buf_len),
depth_(0), depth_(0),
@@ -1912,6 +1912,7 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
#ifdef FLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE #ifdef FLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE
, upper_bound_(0) , upper_bound_(0)
#endif #endif
, check_alignment_(_check_alignment)
// clang-format on // clang-format on
{ {
FLATBUFFERS_ASSERT(size_ < FLATBUFFERS_MAX_BUFFER_SIZE); FLATBUFFERS_ASSERT(size_ < FLATBUFFERS_MAX_BUFFER_SIZE);
@@ -1944,7 +1945,7 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
} }
template<typename T> bool VerifyAlignment(size_t elem) const { template<typename T> bool VerifyAlignment(size_t elem) const {
return (elem & (sizeof(T) - 1)) == 0; return (elem & (sizeof(T) - 1)) == 0 || !check_alignment_;
} }
// Verify a range indicated by sizeof(T). // Verify a range indicated by sizeof(T).
@@ -2127,6 +2128,7 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
mutable size_t upper_bound_; mutable size_t upper_bound_;
#endif #endif
// clang-format on // clang-format on
bool check_alignment_;
}; };
// Convenient way to bundle a buffer and its length, to pass it around // Convenient way to bundle a buffer and its length, to pass it around