Skip to content

Fix crash in RCTWebSocketModule when delegate callbacks fire after module invalidation #55858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lukeharvey wants to merge 1 commit into from
+15 −2
Closed

Fix crash in RCTWebSocketModule when delegate callbacks fire after module invalidation #55858

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions packages/react-native/React/CoreModules/RCTWebSocketModule.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ - (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message
NSString *type;

NSNumber *socketID = [webSocket reactTag];
if (!socketID) {
return;
}
id contentHandler = _contentHandlers[socketID];
if (contentHandler) {
message = [contentHandler processWebsocketMessage:message forSocketID:socketID withType:&type];
Expand All @@ -152,18 +155,25 @@ - (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message
}
}

[self sendEventWithName:@"websocketMessage" body:@{@"data" : message, @"type" : type, @"id" : webSocket.reactTag}];
[self sendEventWithName:@"websocketMessage" body:@{@"data" : message, @"type" : type, @"id" : socketID}];
}

- (void)webSocketDidOpen:(SRWebSocket *)webSocket
{
NSNumber *socketID = [webSocket reactTag];
if (!socketID) {
return;
}
[self sendEventWithName:@"websocketOpen"
body:@{@"id" : webSocket.reactTag, @"protocol" : webSocket.protocol ? webSocket.protocol : @""}];
body:@{@"id" : socketID, @"protocol" : webSocket.protocol ? webSocket.protocol : @""}];
}

- (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error
{
NSNumber *socketID = [webSocket reactTag];
if (!socketID) {
return;
}
_contentHandlers[socketID] = nil;
_sockets[socketID] = nil;
NSDictionary *body =
Expand All @@ -177,6 +187,9 @@ - (void)webSocket:(SRWebSocket *)webSocket
wasClean:(BOOL)wasClean
{
NSNumber *socketID = [webSocket reactTag];
if (!socketID) {
return;
}
_contentHandlers[socketID] = nil;
_sockets[socketID] = nil;
[self sendEventWithName:@"websocketClosed"
Expand Down
Loading