generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-06-25 14:06:27 +02:00
Code Issues Projects Releases Wiki Activity

Fixed ptr size operation.

Browse Source
This commit is contained in:
Takatoshi Kondo 2020-07-02 13:34:00 +09:00
parent 0168468ac8
commit b0860a5f37
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
include/msgpack/v2/create_object_visitor.hpp
View File

@ -114,16 +114,21 @@ public:
obj->type = msgpack::type::STR;
if (m_func && m_func(obj->type, size, m_user_data)) {
obj->via.str.ptr = v;
obj->via.str.size = size;
set_referenced(true);
}
else {
char* tmp = static_cast<char*>(zone().allocate_align(size, MSGPACK_ZONE_ALIGNOF(char)));
if (v) {
char* tmp = static_cast<char*>(zone().allocate_align(size, MSGPACK_ZONE_ALIGNOF(char)));
std::memcpy(tmp, v, size);
obj->via.str.ptr = tmp;
obj->via.str.size = size;
}
else {
obj->via.str.ptr = MSGPACK_NULLPTR;
obj->via.str.size = 0;
}
}
obj->via.str.size = size;
return true;
}
bool visit_bin(const char* v, uint32_t size) {
@ -132,14 +137,21 @@ public:
obj->type = msgpack::type::BIN;
if (m_func && m_func(obj->type, size, m_user_data)) {
obj->via.bin.ptr = v;
obj->via.bin.size = size;
set_referenced(true);
}
else {
char* tmp = static_cast<char*>(zone().allocate_align(size, MSGPACK_ZONE_ALIGNOF(char)));
std::memcpy(tmp, v, size);
obj->via.bin.ptr = tmp;
if (v) {
char* tmp = static_cast<char*>(zone().allocate_align(size, MSGPACK_ZONE_ALIGNOF(char)));
std::memcpy(tmp, v, size);
obj->via.bin.ptr = tmp;
obj->via.bin.size = size;
}
else {
obj->via.bin.ptr = MSGPACK_NULLPTR;
obj->via.bin.size = 0;
}
}
obj->via.bin.size = size;
return true;
}
bool visit_ext(const char* v, uint32_t size) {
@ -148,14 +160,21 @@ public:
obj->type = msgpack::type::EXT;
if (m_func && m_func(obj->type, size, m_user_data)) {
obj->via.ext.ptr = v;
obj->via.ext.size = static_cast<uint32_t>(size - 1);
set_referenced(true);
}
else {
char* tmp = static_cast<char*>(zone().allocate_align(size, MSGPACK_ZONE_ALIGNOF(char)));
std::memcpy(tmp, v, size);
obj->via.ext.ptr = tmp;
if (v) {
char* tmp = static_cast<char*>(zone().allocate_align(size, MSGPACK_ZONE_ALIGNOF(char)));
std::memcpy(tmp, v, size);
obj->via.ext.ptr = tmp;
obj->via.ext.size = static_cast<uint32_t>(size - 1);
}
else {
obj->via.ext.ptr = MSGPACK_NULLPTR;
obj->via.ext.size = 0;
}
}
obj->via.ext.size = static_cast<uint32_t>(size - 1);
return true;
}
bool start_array(uint32_t num_elements) {