Merge branch 'maint'

* maint:
  zmq_msg_move called on uninitialised message in xrep_t::xrecv -- fixed

2 files changed, 5 insertions, 3 deletions

diff --git a/AUTHORS b/AUTHORS
index c679178..8ad7f5e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Martin Hurton <hurtonm@gmail.com>
 Martin Lucina <mato@kotelna.sk>
 Martin Sustrik <sustrik@250bpm.com>
 Matus Hamorsky <mhamorsky@gmail.com>
+Max Wolf <YIDIEPXGXGPN@spammotel.com>
 McClain Looney <m@loonsoft.com>
 Mikael Helbo Kjaer <mhk@designtech.dk>
 Pavel Gushcha <pavimus@gmail.com>
diff --git a/src/xrep.cpp b/src/xrep.cpp
index 68b9d1b..a6c3cf6 100644
--- a/src/xrep.cpp
+++ b/src/xrep.cpp
@@ -199,9 +199,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;
@@ -209,6 +207,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);