REQ socket can die when reply is delivered on wrong unerlying connection -- fixed

f61921d0 · Martin Sustrik · 9129b792 · f61921d0
Commit f61921d0 authored Sep 28, 2010 by Martin Sustrik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

req.cpp src/req.cpp +2 -4

No files found.
--- a/src/req.cpp
+++ b/src/req.cpp
@@ -111,10 +111,8 @@ void zmq::req_t::xkill (class reader_t *pipe_)

 void zmq::req_t::xrevive (class reader_t *pipe_)
 {
-    //  TODO: Actually, misbehaving peer can cause this kind of thing.
-    //  Handle it decently, presumably kill the offending connection.
-    zmq_assert (pipe_ == reply_pipe);
-    reply_pipe_active = true;
+    if (pipe_ == reply_pipe)
+        reply_pipe_active = true;
 }

 void zmq::req_t::xrevive (class writer_t *pipe_)