make sure that reader does not terminate in the middle of a multipart message

2 files changed, 8 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
index 8ad7f5e..70d816a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,6 +30,7 @@ Matus Hamorsky <mhamorsky@gmail.com>
 Max Wolf <YIDIEPXGXGPN@spammotel.com>
 McClain Looney <m@loonsoft.com>
 Mikael Helbo Kjaer <mhk@designtech.dk>
+Nir Soffer <nirsof@gmail.com>
 Pavel Gushcha <pavimus@gmail.com>
 Pavol Malosek <malosek@fastmq.com>
 Pieter Hintjens <ph@imatix.com>
diff --git a/src/xrep.cpp b/src/xrep.cpp
index 96f991a..d45b8aa 100644
--- a/src/xrep.cpp
+++ b/src/xrep.cpp
@@ -101,6 +101,13 @@ void zmq::xrep_t::terminated (reader_t *pipe_)
     for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end ();
           it++) {
         if (it->reader == pipe_) {
+            if (inpipes [current_in].reader == pipe_) {
+
+                //  A reader is not allowed to terminate in the middle of a
+                //  multipart message.
+                zmq_assert (!prefetched);
+                zmq_assert (!more_in);
+            }
             inpipes.erase (it);
             if (terminating)
                 unregister_term_ack ();