Merge pull request #130 from a4z/movector

bluca · web-flow · commit 1bfb3addefba · 2017-07-03T11:16:03.000+01:00
Problem: uninitialized context pointer in socket_t move constructor
diff --git a/zmq.hpp b/zmq.hpp
@@ -506,9 +506,12 @@ namespace zmq
         #endif
 
 #ifdef ZMQ_HAS_RVALUE_REFS
-        inline socket_t(socket_t&& rhs) ZMQ_NOTHROW : ptr(rhs.ptr)
+        inline socket_t(socket_t&& rhs) ZMQ_NOTHROW :
+            ptr(rhs.ptr),
+            ctxptr(rhs.ctxptr)
         {
-            rhs.ptr = NULL;
+            rhs.ptr    = NULL;
+            rhs.ctxptr = NULL;
         }
         inline socket_t& operator=(socket_t&& rhs) ZMQ_NOTHROW
         {

Original file line number	Diff line number	Diff line change
`@@ -506,9 +506,12 @@ namespace zmq`
`506`	`506`	`#endif`
`507`	`507`
`508`	`508`	`#ifdef ZMQ_HAS_RVALUE_REFS`
`509`		`- inline socket_t(socket_t&& rhs) ZMQ_NOTHROW : ptr(rhs.ptr)`
	`509`	`+ inline socket_t(socket_t&& rhs) ZMQ_NOTHROW :`
	`510`	`+ ptr(rhs.ptr),`
	`511`	`+ ctxptr(rhs.ctxptr)`
`510`	`512`	`{`
`511`		`- rhs.ptr = NULL;`
	`513`	`+ rhs.ptr = NULL;`
	`514`	`+ rhs.ctxptr = NULL;`
`512`	`515`	`}`
`513`	`516`	`inline socket_t& operator=(socket_t&& rhs) ZMQ_NOTHROW`
`514`	`517`	`{`