Merge 8e23a00 into 3b782cc

getsentry · Apr 14, 2023 · c23c255 · c23c255
2 parents 3b782cc + 8e23a00
commit c23c255
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Fixes
 
 - Crash when serializing invalid objects (#2858)
+- Possible crash in Core Data tracking (#2865)
 - Don't send screenshots with either width or height of 0 (#2876))
 
 ## 8.4.0

diff --git a/Sources/Sentry/SentryCoreDataTracker.m b/Sources/Sentry/SentryCoreDataTracker.m
@@ -9,6 +9,7 @@
 #import "SentrySDK+Private.h"
 #import "SentryScope+Private.h"
 #import "SentrySpanProtocol.h"
+@import SentryPrivate;
 #import "SentryStacktrace.h"
 #import "SentryThreadInspector.h"
 
@@ -172,8 +173,8 @@ - (NSString *)descriptionForOperations:
 {
     NSMutableDictionary<NSString *, NSNumber *> *result = [NSMutableDictionary new];
 
-    for (NSManagedObject *item in entities) {
-        NSString *cl = item.entity.name;
+    for (id item in entities) {
+        NSString *cl = ((NSManagedObject *)item).entity.name ?: [SwiftDescriptor getObjectClassName:item];
         NSNumber *count = result[cl];
         result[cl] = [NSNumber numberWithInt:count.intValue + 1];
     }