set m_client = NULL before remove_socket which will free itself

Patrick Kwong · Patrick Kwong · commit 669a47567bcc · 2015-06-25T16:03:22.000+08:00
diff --git a/src/sio_socket.cpp b/src/sio_socket.cpp
@@ -316,6 +316,9 @@ namespace sio
     void socket::impl::on_close()
     {
         NULL_GUARD(m_client);
+        sio::client_impl *client = m_client;
+        m_client = NULL;
+
         if(m_connection_timer)
         {
             m_connection_timer->cancel();
@@ -325,9 +328,8 @@ namespace sio
         while (!m_packet_queue.empty()) {
             m_packet_queue.pop();
         }
-        m_client->on_socket_closed(m_nsp);
-        m_client->remove_socket(m_nsp);
-        m_client = NULL;
+        client->on_socket_closed(m_nsp);
+        client->remove_socket(m_nsp);
     }
     
     void socket::impl::on_open()

Original file line number	Diff line number	Diff line change
`@@ -316,6 +316,9 @@ namespace sio`
`316`	`316`	`void socket::impl::on_close()`
`317`	`317`	`{`
`318`	`318`	`NULL_GUARD(m_client);`
	`319`	`+ sio::client_impl *client = m_client;`
	`320`	`+ m_client = NULL;`
	`321`	`+`
`319`	`322`	`if(m_connection_timer)`
`320`	`323`	`{`
`321`	`324`	`m_connection_timer->cancel();`
`@@ -325,9 +328,8 @@ namespace sio`
`325`	`328`	`while (!m_packet_queue.empty()) {`
`326`	`329`	`m_packet_queue.pop();`
`327`	`330`	`}`
`328`		`- m_client->on_socket_closed(m_nsp);`
`329`		`- m_client->remove_socket(m_nsp);`
`330`		`- m_client = NULL;`
	`331`	`+ client->on_socket_closed(m_nsp);`
	`332`	`+ client->remove_socket(m_nsp);`
`331`	`333`	`}`
`332`	`334`
`333`	`335`	`void socket::impl::on_open()`