Skip to content

fix: std::vector unpacking to avoid resize if possible #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aakoshh wants to merge 1 commit into from
Closed

fix: std::vector unpacking to avoid resize if possible #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions include/msgpack/v1/adaptor/vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,29 @@ template <typename T, typename Alloc>
struct convert<std::vector<T, Alloc> > {
msgpack::object const& operator()(msgpack::object const& o, std::vector<T, Alloc>& v) const {
if (o.type != msgpack::type::ARRAY) { THROW msgpack::type_error(); }
v.resize(o.via.array.size);
bool target_size = v.size();
// On one occasion resizing an empty vector caused it to overwrite
// the object array itself with NIL objects, so now we try to use
// reserve, and only resize down.
if (target_size <= o.via.array.size) {
v.reserve(o.via.array.size);
} else {
v.resize(o.via.array.size);
}
if (o.via.array.size > 0) {
msgpack::object* p = o.via.array.ptr;
msgpack::object* const pend = o.via.array.ptr + o.via.array.size;
typename std::vector<T, Alloc>::iterator it = v.begin();
size_t i = 0;
do {
p->convert(*it);
if (i >= target_size) {
T item;
p->convert(item);
v.push_back(item);
} else {
p->convert(v[i]);
}
++i;
++p;
++it;
} while(p < pend);
}
return o;
Expand Down
Loading