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

Merge pull request #431 from ipechorin/master

Browse Source 
Forward-port fix for LIBZMQ-211
This commit is contained in:
Ian Barber 2012-09-26 23:29:18 -07:00
commit 343ec62282
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rep.cpp
View File

@ -72,12 +72,24 @@ int zmq::rep_t::xrecv (msg_t *msg_, int flags_)
int rc = router_t::xrecv (msg_, flags_); int rc = router_t::xrecv (msg_, flags_);
if (rc != 0) if (rc != 0)
return rc; return rc;
zmq_assert (msg_->flags () & msg_t::more);
bool bottom = (msg_->size () == 0); if ((msg_->flags () & msg_t::more)) {
rc = router_t::xsend (msg_, flags_); // Empty message part delimits the traceback stack.
errno_assert (rc == 0); bool bottom = (msg_->size () == 0);
if (bottom)
break; // Push it to the reply pipe.
rc = router_t::xsend (msg_, flags_);
errno_assert (rc == 0);
if (bottom)
break;
}
else {
// If the traceback stack is malformed, discard anything
// already sent to pipe (we're at end of invalid message).
rc = router_t::rollback ();
errno_assert (rc == 0);
}
} }
request_begins = false; request_begins = false;
} }