From 79aea5ffa61f969ec66205f7c9c8c1611a2fd8da Mon Sep 17 00:00:00 2001 From: Max Wolf Date: Thu, 30 Sep 2010 15:10:47 +0200 Subject: zmq_msg_move called on uninitialised message in xrep_t::xrecv -- fixed --- src/xrep.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/xrep.cpp') diff --git a/src/xrep.cpp b/src/xrep.cpp index 5fd6cbb..f50e32e 100644 --- a/src/xrep.cpp +++ b/src/xrep.cpp @@ -190,9 +190,7 @@ int zmq::xrep_t::xsend (zmq_msg_t *msg_, int flags_) int zmq::xrep_t::xrecv (zmq_msg_t *msg_, int flags_) { - // Deallocate old content of the message. - zmq_msg_close (msg_); - + // If there is a prefetched message, return it. if (prefetched) { zmq_msg_move (msg_, &prefetched_msg); more_in = msg_->flags & ZMQ_MSG_MORE; @@ -200,6 +198,9 @@ int zmq::xrep_t::xrecv (zmq_msg_t *msg_, int flags_) return 0; } + // Deallocate old content of the message. + zmq_msg_close (msg_); + // If we are in the middle of reading a message, just grab next part of it. if (more_in) { zmq_assert (inpipes [current_in].active); -- cgit v1.2.3