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

Fix one more memory size calculation.

Browse Source 
See https://github.com/msgpack/msgpack-c/issues/149
and the commit d6cc5494a9
This commit is contained in:
Mircea Baja
2015-01-05 21:55:57 +00:00
parent bf8c830eef
commit 7e597779e4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/msgpack/unpack.hpp
View File

@@ -1262,7 +1262,12 @@ inline void unpacker::expand_buffer(std::size_t size)
std::size_t next_size = m_initial_buffer_size; // include COUNTER_SIZE std::size_t next_size = m_initial_buffer_size; // include COUNTER_SIZE
std::size_t not_parsed = m_used - m_off; std::size_t not_parsed = m_used - m_off;
while(next_size < size + not_parsed + COUNTER_SIZE) { while(next_size < size + not_parsed + COUNTER_SIZE) {
next_size *= 2; std::size_t tmp_next_size = next_size * 2;
if (tmp_next_size <= next_size) {
next_size = size + not_parsed + COUNTER_SIZE;
break;
}
next_size = tmp_next_size;
} }
char* tmp = static_cast<char*>(::malloc(next_size)); char* tmp = static_cast<char*>(::malloc(next_size));