Merge 67b6892 into 4654f66

getsentry · Apr 6, 2023 · f393202 · f393202
2 parents 4654f66 + 67b6892
commit f393202
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Fixes
 
 - Crash when serializing invalid objects (#2858)
+- Possible crash in Core Data tracking (#2865)
 
 ## 8.4.0
 

diff --git a/Sources/Sentry/SentryCoreDataTracker.m b/Sources/Sentry/SentryCoreDataTracker.m
@@ -146,8 +146,9 @@ - (NSString *)descriptionForOperations:
 {
     NSMutableDictionary<NSString *, NSNumber *> *result = [NSMutableDictionary new];
 
-    for (NSManagedObject *item in entities) {
-        NSString *cl = item.entity.name;
+    for (id item in entities) {
+        // entity.name is nullable! fall back to old behavior
+        NSString *cl = ((NSManagedObject *)item).entity.name ?: NSStringFromClass([item class]);
         NSNumber *count = result[cl];
         result[cl] = [NSNumber numberWithInt:count.intValue + 1];
     }