Ensure to cleanup properly in -disconnect & -dealloc - fixes crashes

psineur · psineur · commit 9f1dc941ffe9 · 2013-06-12T18:26:45.000-07:00
diff --git a/SocketIO.m b/SocketIO.m
@@ -163,6 +163,8 @@ - (void) disconnect
     else if (_isConnecting) {
         [_handshake cancel];
     }
+
+    [self onDisconnect: nil];
 }
 
 - (void) sendMessage:(NSString *)data
@@ -762,10 +764,14 @@ - (void) connection:(NSURLConnection *)connection
 
 - (void) dealloc
 {
+    _handshake.delegate = nil;
+    _handshake = nil;
+
     _host = nil;
     _sid = nil;
     _endpoint = nil;
     
+    _transport.delegate = nil;
     _transport = nil;
     
     [_timeout invalidate];

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,8 @@ - (void) disconnect`
`163`	`163`	`else if (_isConnecting) {`
`164`	`164`	`[_handshake cancel];`
`165`	`165`	`}`
	`166`	`+`
	`167`	`+ [self onDisconnect: nil];`
`166`	`168`	`}`
`167`	`169`
`168`	`170`	`- (void) sendMessage:(NSString *)data`
`@@ -762,10 +764,14 @@ - (void) connection:(NSURLConnection *)connection`
`762`	`764`
`763`	`765`	`- (void) dealloc`
`764`	`766`	`{`
	`767`	`+ _handshake.delegate = nil;`
	`768`	`+ _handshake = nil;`
	`769`	`+`
`765`	`770`	`_host = nil;`
`766`	`771`	`_sid = nil;`
`767`	`772`	`_endpoint = nil;`
`768`	`773`
	`774`	`+ _transport.delegate = nil;`
`769`	`775`	`_transport = nil;`
`770`	`776`
`771`	`777`	`[_timeout invalidate];`