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

Close messages that failed to send

Browse Source 
pipe_t.write only takes control of the underlying message memory when it
succeeds. When it returns failure, we must close the message ourselves to
clean up that memory.

This patch is sponsored by FarSounder, Inc (farsounder.com)
This commit is contained in:
Topher Brown
2015-01-13 17:36:09 -05:00
parent 94b0ad3eaa
commit 866a04656e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/router.cpp
View File

@@ -246,12 +246,16 @@ int zmq::router_t::xsend (msg_t *msg_)
} }
bool ok = current_out->write (msg_); bool ok = current_out->write (msg_);
if (unlikely (!ok)) if (unlikely (!ok)) {
current_out = NULL; // Message failed to send - we must close it ourselves.
else int rc = msg_->close ();
if (!more_out) { errno_assert (rc == 0);
current_out->flush ();
current_out = NULL; current_out = NULL;
} else {
if (!more_out) {
current_out->flush ();
current_out = NULL;
}
} }
} }
else { else {