cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use-after-release issue in WebSocket

Browse Source
This commit is contained in:
Hank Bao 2015-09-09 22:33:35 +08:00
parent 80cfe8c534
commit 44508a5193
1 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
SocketIOClientSwift/WebSocket.swift
View File

@ -133,15 +133,18 @@ public class WebSocket : NSObject, NSStreamDelegate {
if isCreated { if isCreated {
return return
} }
unowned let weakSelf = self
dispatch_async(queue,{ dispatch_async(queue, { [weak self] in
weakSelf.didDisconnect = false if let weakSelf = self {
weakSelf.didDisconnect = false
}
}) })
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), { dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), { [weak self] in
weakSelf.isCreated = true if let weakSelf = self {
weakSelf.createHTTPRequest() weakSelf.isCreated = true
weakSelf.isCreated = false weakSelf.createHTTPRequest()
weakSelf.isCreated = false
}
}) })
} }
@ -370,14 +373,15 @@ public class WebSocket : NSObject, NSStreamDelegate {
} }
} }
if totalSize > 0 { if totalSize > 0 {
unowned let weakSelf = self
if validateResponse(buffer, bufferLen: totalSize) { if validateResponse(buffer, bufferLen: totalSize) {
dispatch_async(queue,{ dispatch_async(queue, { [weak self] in
weakSelf.connected = true if let weakSelf = self {
if let connectBlock = weakSelf.onConnect { weakSelf.connected = true
connectBlock() if let connectBlock = weakSelf.onConnect {
connectBlock()
}
weakSelf.delegate?.websocketDidConnect(weakSelf)
} }
weakSelf.delegate?.websocketDidConnect(self)
}) })
totalSize += 1 //skip the last \n totalSize += 1 //skip the last \n
let restSize = bufferLen - totalSize let restSize = bufferLen - totalSize
@ -515,11 +519,13 @@ public class WebSocket : NSObject, NSStreamDelegate {
data = NSData(bytes: UnsafePointer<UInt8>((buffer+offset)), length: Int(len)) data = NSData(bytes: UnsafePointer<UInt8>((buffer+offset)), length: Int(len))
} }
if receivedOpcode == OpCode.Pong.rawValue { if receivedOpcode == OpCode.Pong.rawValue {
dispatch_async(queue,{[unowned self] in dispatch_async(queue, { [weak self] in
if let pongBlock = self.onPong { if let weakSelf = self {
pongBlock() if let pongBlock = weakSelf.onPong {
pongBlock()
}
weakSelf.pongDelegate?.websocketDidReceivePong(weakSelf)
} }
self.pongDelegate?.websocketDidReceivePong(self)
}) })
let step = Int(offset+numericCast(len)) let step = Int(offset+numericCast(len))
@ -608,19 +614,23 @@ public class WebSocket : NSObject, NSStreamDelegate {
writeError(CloseCode.Encoding.rawValue) writeError(CloseCode.Encoding.rawValue)
return false return false
} }
dispatch_async(queue,{[unowned self] in dispatch_async(queue, { [weak self] in
if let textBlock = self.onText { if let weakSelf = self {
textBlock(str! as String) if let textBlock = weakSelf.onText {
textBlock(str! as String)
}
weakSelf.delegate?.websocketDidReceiveMessage(weakSelf, text: str! as String)
} }
self.delegate?.websocketDidReceiveMessage(self, text: str! as String)
}) })
} else if response.code == .BinaryFrame { } else if response.code == .BinaryFrame {
let data = response.buffer! //local copy so it is perverse for writing let data = response.buffer! //local copy so it is perverse for writing
dispatch_async(queue,{[unowned self] in dispatch_async(queue, { [weak self] in
if let dataBlock = self.onData { if let weakSelf = self {
dataBlock(data) if let dataBlock = weakSelf.onData {
dataBlock(data)
}
weakSelf.delegate?.websocketDidReceiveData(weakSelf, data: data)
} }
self.delegate?.websocketDidReceiveData(self, data: data)
}) })
} }
readStack.removeLast() readStack.removeLast()
@ -723,12 +733,14 @@ public class WebSocket : NSObject, NSStreamDelegate {
///used to preform the disconnect delegate ///used to preform the disconnect delegate
private func doDisconnect(error: NSError?) { private func doDisconnect(error: NSError?) {
if !self.didDisconnect { if !self.didDisconnect {
dispatch_async(queue,{[unowned self] in dispatch_async(queue, { [weak self] in
self.didDisconnect = true if let weakSelf = self {
if let disconnect = self.onDisconnect { weakSelf.didDisconnect = true
disconnect(error) if let disconnect = weakSelf.onDisconnect {
disconnect(error)
}
weakSelf.delegate?.websocketDidDisconnect(weakSelf, error: error)
} }
self.delegate?.websocketDidDisconnect(self, error: error)
}) })
} }
} }