generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-11-09 23:57:48 +01:00
Code Issues Projects Releases Wiki Activity

Fixed #956.

Browse Source 
Called memcpy only if STR/BIN size > 0.
This commit is contained in:
Takatoshi Kondo
2021-05-15 23:43:33 +09:00
parent fc3de9806e
commit 3feac1f51d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/msgpack/v1/unpack.hpp
View File

@@ -171,7 +171,7 @@ inline void unpack_str(unpack_user& u, const char* p, uint32_t l, msgpack::objec
o.via.str.ptr = p; o.via.str.ptr = p;
u.set_referenced(true); u.set_referenced(true);
} }
else { else if (l > 0) {
if (l > u.limit().str()) throw msgpack::str_size_overflow("str size overflow"); if (l > u.limit().str()) throw msgpack::str_size_overflow("str size overflow");
char* tmp = static_cast<char*>(u.zone().allocate_align(l, MSGPACK_ZONE_ALIGNOF(char))); char* tmp = static_cast<char*>(u.zone().allocate_align(l, MSGPACK_ZONE_ALIGNOF(char)));
std::memcpy(tmp, p, l); std::memcpy(tmp, p, l);
@@ -187,7 +187,7 @@ inline void unpack_bin(unpack_user& u, const char* p, uint32_t l, msgpack::objec
o.via.bin.ptr = p; o.via.bin.ptr = p;
u.set_referenced(true); u.set_referenced(true);
} }
else { else if (l > 0) {
if (l > u.limit().bin()) throw msgpack::bin_size_overflow("bin size overflow"); if (l > u.limit().bin()) throw msgpack::bin_size_overflow("bin size overflow");
char* tmp = static_cast<char*>(u.zone().allocate_align(l, MSGPACK_ZONE_ALIGNOF(char))); char* tmp = static_cast<char*>(u.zone().allocate_align(l, MSGPACK_ZONE_ALIGNOF(char)));
std::memcpy(tmp, p, l); std::memcpy(tmp, p, l);