generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-31 14:39:55 +01:00
Code Issues Projects Releases Wiki Activity

Fixed segfault bug sometimes happening when pruning the trie/mtrie.

Browse Source 
The cause behind the segfault was next.node being deleted but count still
being non-zero.

Signed-off-by: Staffan Gimåker <staffan@spotify.com>
This commit is contained in:
Staffan Gimåker 2012-01-26 13:26:09 +01:00
parent 19129edc60
commit bc4d1b6002
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mtrie.cpp
View File

@ -42,8 +42,11 @@ zmq::mtrie_t::mtrie_t () :
zmq::mtrie_t::~mtrie_t ()
{
if (count == 1)
if (count == 1) {
zmq_assert (next.node);
delete next.node;
next.node = 0;
}
else if (count > 1) {
for (unsigned short i = 0; i != count; ++i)
if (next.table [i])
@ -174,6 +177,7 @@ void zmq::mtrie_t::rm_helper (pipe_t *pipe_, unsigned char **buff_,
if (next.node->is_redundant ()) {
delete next.node;
next.node = 0;
count = 0;
--live_nodes;
}
return;
@ -182,13 +186,14 @@ void zmq::mtrie_t::rm_helper (pipe_t *pipe_, unsigned char **buff_,
// If there are multiple subnodes.
for (unsigned short c = 0; c != count; c++) {
(*buff_) [buffsize_] = min + c;
if (next.table [c])
if (next.table [c]) {
next.table [c]->rm_helper (pipe_, buff_, buffsize_ + 1,
maxbuffsize_, func_, arg_);
if (next.table [c]->is_redundant ()) {
delete next.table [c];
next.table [c] = 0;
--live_nodes;
if (next.table [c]->is_redundant ()) {
delete next.table [c];
next.table [c] = 0;
--live_nodes;
}
}
}
}
@ -221,8 +226,10 @@ bool zmq::mtrie_t::rm_helper (unsigned char *prefix_, size_t size_,
if (next_node->is_redundant ()) {
delete next_node;
if (count == 1)
if (count == 1) {
next.node = 0;
count = 0;
}
else
next.table [c - min] = 0;
--live_nodes;
@ -272,7 +279,7 @@ void zmq::mtrie_t::match (unsigned char *data_, size_t size_,
}
}
bool zmq::mtrie_t::is_redundant() const
bool zmq::mtrie_t::is_redundant () const
{
return pipes.empty () && live_nodes == 0;
}

11
src/trie.cpp
View File

@ -43,8 +43,11 @@ zmq::trie_t::trie_t () :
zmq::trie_t::~trie_t ()
{
if (count == 1)
if (count == 1) {
zmq_assert (next.node);
delete next.node;
next.node = 0;
}
else if (count > 1) {
for (unsigned short i = 0; i != count; ++i)
if (next.table [i])
@ -154,8 +157,10 @@ bool zmq::trie_t::rm (unsigned char *prefix_, size_t size_)
if (next_node->is_redundant ()) {
delete next_node;
if (count == 1)
if (count == 1) {
next.node = 0;
count = 0;
}
else
next.table [c - min] = 0;
--live_nodes;
@ -242,7 +247,7 @@ void zmq::trie_t::apply_helper (
}
}
bool zmq::trie_t::is_redundant() const
bool zmq::trie_t::is_redundant () const
{
return refcnt == 0 && live_nodes == 0;
}