generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-18 03:29:49 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #354 from redboltz/fix_348

Browse Source 
Fixed #348.
This commit is contained in:
Takatoshi Kondo
2015-08-26 16:14:55 +09:00
parent 95e0fc5cef 92822996e2
commit 9ee1168cc4
4 changed files with 91 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/msgpack/unpack.hpp
View File

@@ -1534,13 +1534,16 @@ inline unpacked unpack(
msgpack::object obj;
msgpack::unique_ptr<msgpack::zone> z(new msgpack::zone);
referenced = false;
std::size_t noff = off;
unpack_return ret = detail::unpack_imp(
data, len, off, *z, obj, referenced, f, user_data, limit);
data, len, noff, *z, obj, referenced, f, user_data, limit);
switch(ret) {
case UNPACK_SUCCESS:
off = noff;
return unpacked(obj, msgpack::move(z));
case UNPACK_EXTRA_BYTES:
off = noff;
return unpacked(obj, msgpack::move(z));
case UNPACK_CONTINUE:
throw msgpack::insufficient_bytes("insufficient bytes");
@@ -1583,15 +1586,18 @@ inline void unpack(unpacked& result,
msgpack::object obj;
msgpack::unique_ptr<msgpack::zone> z(new msgpack::zone);
referenced = false;
std::size_t noff = off;
unpack_return ret = detail::unpack_imp(
data, len, off, *z, obj, referenced, f, user_data, limit);
data, len, noff, *z, obj, referenced, f, user_data, limit);
switch(ret) {
case UNPACK_SUCCESS:
off = noff;
result.set(obj);
result.zone() = msgpack::move(z);
return;
case UNPACK_EXTRA_BYTES:
off = noff;
result.set(obj);
result.zone() = msgpack::move(z);
return;
@@ -1635,14 +1641,17 @@ inline msgpack::object unpack(
unpack_reference_func f, void* user_data, unpack_limit const& limit)
{
msgpack::object obj;
std::size_t noff = off;
referenced = false;
unpack_return ret = detail::unpack_imp(
data, len, off, z, obj, referenced, f, user_data, limit);
data, len, noff, z, obj, referenced, f, user_data, limit);
switch(ret) {
case UNPACK_SUCCESS:
off = noff;
return obj;
case UNPACK_EXTRA_BYTES:
off = noff;
return obj;
case UNPACK_CONTINUE:
throw msgpack::insufficient_bytes("insufficient bytes");