Merge pull request #85 from serge-medvedev/context-close-destruct-assert-issue

benjamg · web-flow · commit 7faa9b061843 · 2016-09-19T14:27:15.000+01:00
Failing assertion in dtor of context_t
diff --git a/zmq.hpp b/zmq.hpp
@@ -410,14 +410,17 @@ namespace zmq
 
         inline ~context_t () ZMQ_NOTHROW
         {
-            int rc = zmq_ctx_destroy (ptr);
-            ZMQ_ASSERT (rc == 0);
+            close();
         }
 
         inline void close() ZMQ_NOTHROW
         {
+            if (ptr == NULL)
+                return;
+
             int rc = zmq_ctx_destroy (ptr);
             ZMQ_ASSERT (rc == 0);
+            ptr = NULL;
         }
 
         //  Be careful with this, it's probably only useful for

Original file line number	Diff line number	Diff line change
`@@ -410,14 +410,17 @@ namespace zmq`
`410`	`410`
`411`	`411`	`inline ~context_t () ZMQ_NOTHROW`
`412`	`412`	`{`
`413`		`- int rc = zmq_ctx_destroy (ptr);`
`414`		`- ZMQ_ASSERT (rc == 0);`
	`413`	`+ close();`
`415`	`414`	`}`
`416`	`415`
`417`	`416`	`inline void close() ZMQ_NOTHROW`
`418`	`417`	`{`
	`418`	`+ if (ptr == NULL)`
	`419`	`+ return;`
	`420`	`+`
`419`	`421`	`int rc = zmq_ctx_destroy (ptr);`
`420`	`422`	`ZMQ_ASSERT (rc == 0);`
	`423`	`+ ptr = NULL;`
`421`	`424`	`}`
`422`	`425`
`423`	`426`	`// Be careful with this, it's probably only useful for`