Merge pull request #3476 from TomMD/fix/memory-leak

Request handling leaked memory.  Depending on the application's use o…

RELICENSE/tommd.md

+# Permission to Relicense under MPLv2
+
+This is a statement by Thomas M. DuBuisson
+that grants permission to relicense its copyrights in the libzmq C++
+library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
+
+A portion of the commits made by the Github handle "tommd", with
+commit author "Thomas M. DuBuisson", are copyright of Thomas M. DuBuisson.
+This document hereby grants the libzmq project team to relicense libzmq,
+including all past, present and future contributions of the author listed above.
+
+Thomas M. DuBuisson
+2019/04/11

src/req.cpp

@@ -36,14 +36,6 @@
 #include "random.hpp"
 #include "likely.hpp"
 
-extern "C" {
-static void free_id (void *data_, void *hint_)
-{
-    LIBZMQ_UNUSED (hint_);
-    free (data_);
-}
-}
-
 zmq::req_t::req_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
     dealer_t (parent_, tid_, sid_),
     _receiving_reply (false),
@@ -81,23 +73,17 @@ int zmq::req_t::xsend (msg_t *msg_)
         if (_request_id_frames_enabled) {
             _request_id++;
 
-            //  Copy request id before sending (see issue #1695 for details).
-            uint32_t *request_id_copy =
-              static_cast<uint32_t *> (malloc (sizeof (uint32_t)));
-            zmq_assert (request_id_copy);
-
-            *request_id_copy = _request_id;
-
             msg_t id;
-            int rc =
-              id.init_data (request_id_copy, sizeof (uint32_t), free_id, NULL);
+            int rc = id.init_size (sizeof (uint32_t));
+            memcpy (id.data (), &_request_id, sizeof (uint32_t));
             errno_assert (rc == 0);
             id.set_flags (msg_t::more);
 
             rc = dealer_t::sendpipe (&id, &_reply_pipe);
-            if (rc != 0)
+            if (rc != 0) {
                 return -1;
             }
+        }
 
         msg_t bottom;
         int rc = bottom.init ();