Skip to content
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

Jump to bottom

fix: crash when insert nil value into a dictionary #30066

Closed
wants to merge 8 commits into from
Closed

fix: crash when insert nil value into a dictionary #30066

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
80c7759
fix: crash when insert nil value into a dictionary
Sep 29, 2020
78197e7
Merge branch 'master' into fix/crash_in_didFailWithError_at_RCTWebSoc…
marksinkovics Sep 29, 2020
b37c631
Merge branch 'master' into fix/crash_in_didFailWithError_at_RCTWebSoc…
marksinkovics Sep 29, 2020
74770ed
Merge branch 'master' into fix/crash_in_didFailWithError_at_RCTWebSoc…
marksinkovics Oct 6, 2020
f0733aa
Merge branch 'master' into fix/crash_in_didFailWithError_at_RCTWebSoc…
marksinkovics Oct 7, 2020
5e49ce3
Merge branch 'master' into fix/crash_in_didFailWithError_at_RCTWebSoc…
marksinkovics Oct 9, 2020
17e62b6
fix: add a better error message
Oct 11, 2020
413d7ce
Merge branch 'master' into fix/crash_in_didFailWithError_at_RCTWebSoc…
marksinkovics Oct 11, 2020
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
6 changes: 5 additions & 1 deletion React/CoreModules/RCTWebSocketModule.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,11 @@ - (void)webSocket:(RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error
NSNumber *socketID = [webSocket reactTag];
_contentHandlers[socketID] = nil;
_sockets[socketID] = nil;
[self sendEventWithName:@"websocketFailed" body:@{@"message" : error.localizedDescription, @"id" : socketID}];
NSDictionary *body = @{
@"message" : error.localizedDescription ?: @"",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this say something like "undefined" instead of empty string?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your comment. I updated the error message to Undefined, error is nil.
Please let me know if you have any further feedback.

@"id" : socketID ?: @(-1)
};
[self sendEventWithName:@"websocketFailed" body:body];
}

- (void)webSocket:(RCTSRWebSocket *)webSocket
Expand Down