generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-23 07:12:47 +01:00
Code Issues Projects Releases Wiki Activity

Problem: deallocate calls release after de-allocation

Browse Source 
Solution: reduce to newly extracted function clear, which does not use the freed pointer
This commit is contained in:
Simon Giesecke 2018-05-17 14:34:52 +02:00
parent e37fc47fb6
commit 22b72bb678
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/decoder_allocators.cpp
View File

@ -108,17 +108,21 @@ void zmq::shared_message_memory_allocator::deallocate ()
if (buf && !c->sub (1)) {
std::free (buf);
}
release ();
clear ();
}
unsigned char *zmq::shared_message_memory_allocator::release ()
{
unsigned char *b = buf;
clear ();
return b;
}
void zmq::shared_message_memory_allocator::clear ()
{
buf = NULL;
bufsize = 0;
msg_content = NULL;
return b;
}
void zmq::shared_message_memory_allocator::inc_ref ()

2
src/decoder_allocators.hpp
View File

@ -120,6 +120,8 @@ class shared_message_memory_allocator
void advance_content () { msg_content++; }
private:
void clear ();
unsigned char *buf;
std::size_t bufsize;
const std::size_t max_size;