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

[C++] Fix DetachedBuffer move assignment lifetime (#4437)

Browse Source 
* Fix DetachedBuffer move assignment lifetime

DetachedBuffer move assignment now destroys it's own content,
rather than waiting for the destructor of other.
See more under #4435

Add missing function return type

* Rename empty_assign to reset

Reset after destroy
reset() now operates on itself
This commit is contained in:
Lukas Bergdoll
2017-09-14 18:22:55 +02:00
committed by Wouter van Oortmerssen
parent 1d444f63d3
commit cc25516d3e
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
include/flatbuffers/flatbuffers.h
View File

@@ -445,32 +445,26 @@ class DetachedBuffer {
: allocator_(other.allocator_), own_allocator_(other.own_allocator_), : allocator_(other.allocator_), own_allocator_(other.own_allocator_),
buf_(other.buf_), reserved_(other.reserved_), cur_(other.cur_), buf_(other.buf_), reserved_(other.reserved_), cur_(other.cur_),
size_(other.size_) { size_(other.size_) {
other.allocator_ = nullptr; other.reset();
other.own_allocator_ = false;
other.buf_ = nullptr;
other.reserved_ = 0;
other.cur_ = nullptr;
other.size_ = 0;
} }
DetachedBuffer &operator=(DetachedBuffer &&other) { DetachedBuffer &operator=(DetachedBuffer &&other) {
std::swap(allocator_, other.allocator_); destroy();
std::swap(own_allocator_, other.own_allocator_);
std::swap(buf_, other.buf_); allocator_ = other.allocator_;
std::swap(reserved_, other.reserved_); own_allocator_ = other.own_allocator_;
std::swap(cur_, other.cur_); buf_ = other.buf_;
std::swap(size_, other.size_); reserved_ = other.reserved_;
cur_ = other.cur_;
size_ = other.size_;
other.reset();
return *this; return *this;
} }
~DetachedBuffer() { ~DetachedBuffer() {
if (buf_) { destroy();
assert(allocator_);
allocator_->deallocate(buf_, reserved_);
}
if (own_allocator_ && allocator_) {
delete allocator_;
}
} }
const uint8_t *data() const { const uint8_t *data() const {
@@ -515,6 +509,27 @@ class DetachedBuffer {
size_t reserved_; size_t reserved_;
uint8_t *cur_; uint8_t *cur_;
size_t size_; size_t size_;
inline void destroy() {
if (buf_) {
assert(allocator_);
allocator_->deallocate(buf_, reserved_);
}
if (own_allocator_ && allocator_) {
delete allocator_;
}
reset();
}
inline void reset() {
allocator_ = nullptr;
own_allocator_ = false;
buf_ = nullptr;
reserved_ = 0;
cur_ = nullptr;
size_ = 0;
}
}; };
// This is a minimal replication of std::vector<uint8_t> functionality, // This is a minimal replication of std::vector<uint8_t> functionality,