Skip to content

Fix a crash that may occur when resolving a thread-safe reference #8722

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix a crash that may occur when resolving a thread-safe reference #8722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e70ba1f
Check RLMObjectBase for null after resolving thread safe reference
PoltoraIvana Nov 26, 2024
0418d34
Add new case to RealmError
PoltoraIvana Nov 26, 2024
9286062
Rename new case in RealmError
PoltoraIvana Nov 26, 2024
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
4 changes: 4 additions & 0 deletions Realm/RLMError.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ typedef RLM_ERROR_ENUM(NSInteger, RLMError, RLMErrorDomain) {
subscription or the server will reject the write.
*/
RLMErrorNoSubscriptionForWrite = 22,
/ **
Denotes an error that occurs when resolving thread safe reference returns a nil object.
*/
RLMErrorObjectNotFound = 23
};

#pragma mark - RLMSyncError
Expand Down
7 changes: 7 additions & 0 deletions Realm/RLMObjectBase.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,13 @@ - (void)addNotificationBlock:(RLMObjectNotificationCallback)block
return;
}
RLMObjectBase *obj = [_realm resolveThreadSafeReference:tsr];
if (!obj) {
error = [NSError errorWithDomain:RLMAppErrorDomain
code:RLMErrorObjectNotFound
userInfo:nil];
block(nil, nil, nil, nil, error);
return;
}

_object = realm::Object(_realm->_realm, *obj->_info->objectSchema, obj->_row);
_token = _object.add_notification_callback(ObjectChangeCallbackWrapper{block, obj},
Expand Down