diff options
author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2019-10-23 22:44:55 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-04-13 22:08:08 +0000 |
commit | 9df1b3a80f39cf7e7ccd6264a207518426a524f6 (patch) | |
tree | e1e6721fd69c71f83b5592515c2737f6c98703e3 | |
parent | bbf60c1bcbc5722870edb7327fc59d4025a7644e (diff) | |
download | mongo-r4.0.24.tar.gz |
SERVER-44132 DataBuilder move assignment computes size incorrectlyr4.0.24-rc1r4.0.24
(cherry picked from commit 4cf93b3802fa90ba02cdeed36b4f6d615b6d6393)
(cherry picked from commit 1beb3391a2006a6daea590abd7585d080a4209f7)
-rw-r--r-- | src/mongo/base/data_builder.h | 5 | ||||
-rw-r--r-- | src/mongo/base/data_builder_test.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/mongo/base/data_builder.h b/src/mongo/base/data_builder.h index 5e39e639489..3299015c9cd 100644 --- a/src/mongo/base/data_builder.h +++ b/src/mongo/base/data_builder.h @@ -79,9 +79,12 @@ public: } DataBuilder& operator=(DataBuilder&& other) { + size_t size = other.size(); _buf = std::move(other._buf); _capacity = other._capacity; - _unwrittenSpaceCursor = {_buf.get(), _buf.get() + other.size()}; + char* start = _buf.get() + size; + char* end = _buf.get() + _capacity; + _unwrittenSpaceCursor = {start, end}; other._capacity = 0; other._unwrittenSpaceCursor = {nullptr, nullptr}; diff --git a/src/mongo/base/data_builder_test.cpp b/src/mongo/base/data_builder_test.cpp index d497e78622e..b017384bbc3 100644 --- a/src/mongo/base/data_builder_test.cpp +++ b/src/mongo/base/data_builder_test.cpp @@ -153,7 +153,7 @@ TEST(DataBuilder, Clear) { } TEST(DataBuilder, Move) { - DataBuilder db(1); + DataBuilder db(42); ASSERT_EQUALS(true, db.writeAndAdvance<uint16_t>(1).isOK()); @@ -162,7 +162,7 @@ TEST(DataBuilder, Move) { ConstDataRangeCursor cdrc = db2.getCursor(); ASSERT_EQUALS(static_cast<uint16_t>(1), cdrc.readAndAdvance<uint16_t>().getValue()); - ASSERT_EQUALS(2u, db2.capacity()); + ASSERT_EQUALS(42u, db2.capacity()); ASSERT_EQUALS(2u, db2.size()); ASSERT_EQUALS(0u, db.capacity()); |