fix: crash when insert nil value into a dictionary #30066
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Convert `error` to empty NSString if the original value is nil - Convert `socketID` to a NSNumber object, which stores -1 if the original value is nil
facebook-github-bot
added
the
CLA Signed
Base commit: d8b0e9d |
Base commit: d8b0e9d |
mastery-dhananjay-jadhav
approved these changes
Oct 1, 2020
sammy-SC
reviewed
Oct 11, 2020
| @@ -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 ?: @"", | |||
There was a problem hiding this comment.
Should this say something like "undefined" instead of empty string?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
@sammy-SC has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
|
thank you @marksinkovics |
|
This pull request was successfully merged by @marksinkovics in 748aa13. When will my fix make it into a release? | Upcoming Releases |
kelset
pushed a commit
that referenced
this pull request
Nov 27, 2020
Summary: This PR attempts to fix issue #28278 and #29525 On Crashlytics, the following error occurs in file `RCTWebSocketModule.m` at method `-[RCTWebSocketModule webSocket:didFailWithError:]` when a nil value is inserted into a dictionary as a value. ``` Fatal Exception: NSInvalidArgumentException *** -[__NSPlaceholderDictionary initWithObjects:forKeys:count:]: attempt to insert nil object from objects[0] ``` This PR is following the suggestion of this: #28278 (comment) and it replaces the values of any property if it is nil. In detail: - it converts `error` to empty NSString if the original value is nil - it converts `socketID` to a NSNumber object, which stores `-1` if the original value is nil ## Changelog [iOS] [Fixed] - A crash in WebSocket module Pull Request resolved: #30066 Test Plan: We were not able to reproduce the crash, but the report itself provided enough information to find a solution for this issue. Reviewed By: shergin Differential Revision: D24241147 Pulled By: sammy-SC fbshipit-source-id: d5d632b49ca77b5d8be8b9c32358bef68f17d30a
brentvatne
pushed a commit
to expo/react-native
that referenced
this pull request
Dec 3, 2020
Summary: This PR attempts to fix issue facebook#28278 and facebook#29525 On Crashlytics, the following error occurs in file `RCTWebSocketModule.m` at method `-[RCTWebSocketModule webSocket:didFailWithError:]` when a nil value is inserted into a dictionary as a value. ``` Fatal Exception: NSInvalidArgumentException *** -[__NSPlaceholderDictionary initWithObjects:forKeys:count:]: attempt to insert nil object from objects[0] ``` This PR is following the suggestion of this: facebook#28278 (comment) and it replaces the values of any property if it is nil. In detail: - it converts `error` to empty NSString if the original value is nil - it converts `socketID` to a NSNumber object, which stores `-1` if the original value is nil ## Changelog [iOS] [Fixed] - A crash in WebSocket module Pull Request resolved: facebook#30066 Test Plan: We were not able to reproduce the crash, but the report itself provided enough information to find a solution for this issue. Reviewed By: shergin Differential Revision: D24241147 Pulled By: sammy-SC fbshipit-source-id: d5d632b49ca77b5d8be8b9c32358bef68f17d30a
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR attempts to fix issue #28278 and #29525
On Crashlytics, the following error occurs in file
RCTWebSocketModule.mat method-[RCTWebSocketModule webSocket:didFailWithError:]when a nil value is inserted into a dictionary as a value.This PR is following the suggestion of this: #28278 (comment) and it replaces the values of any property if it is nil. In detail:
errorto empty NSString if the original value is nilsocketIDto a NSNumber object, which stores-1if the original value is nilChangelog
[iOS] [Fixed] - A crash in WebSocket module
Test Plan
We were not able to reproduce the crash, but the report itself provided enough information to find a solution for this issue.