@@ -51,7 +51,7 @@ - (instancetype)initWithReport:(NSDictionary *)report inAppLogic:(SentryInAppLog
5151 // here. For more details please check out SentryCrashScopeObserver.
5252 NSMutableDictionary *userContextMerged =
5353 [[NSMutableDictionary alloc ] initWithDictionary: userContextUnMerged];
54- [userContextMerged addEntriesFromDictionary: report[@" sentry_sdk_scope"
54+ [userContextMerged addEntriesFromDictionary: report[@" sentry_sdk_scope" ?: @{} ];
5555 [userContextMerged removeObjectForKey: @" sentry_sdk_scope"
5656 self.userContext = userContextMerged;
5757
@@ -108,8 +108,9 @@ - (SentryEvent *_Nullable)convertReportToEvent
108108 if ([self .report[@" report" @" timestamp" isKindOfClass: NSNumber .class]) {
109109 event.timestamp = [NSDate
110110 dateWithTimeIntervalSince1970: [self .report[@" report" @" timestamp" integerValue ]];
111- } else {
112- event.timestamp = sentry_fromIso8601String (self.report [@" report" @" timestamp"
111+ } else if ([self .report[@" report" @" timestamp" isKindOfClass: NSString .class]) {
112+ event.timestamp = sentry_fromIso8601String (
113+ SENTRY_UNWRAP_NULLABLE (NSString , self.report [@" report" @" timestamp"
113114 }
114115 event.threads = [self convertThreads ];
115116 event.debugMeta = [self debugMetaForThreads: event.threads];
@@ -119,7 +120,7 @@ - (SentryEvent *_Nullable)convertReportToEvent
119120 event.environment = self.userContext [@" environment"
120121
121122 NSMutableDictionary *mutableContext =
122- [[NSMutableDictionary alloc ] initWithDictionary: self .userContext[@" context"
123+ [[NSMutableDictionary alloc ] initWithDictionary: self .userContext[@" context" ?: @{} ];
123124 if (self.userContext [@" traceContext"
124125 mutableContext[@" trace" userContext [@" traceContext"
125126 }
@@ -188,11 +189,16 @@ - (SentryUser *_Nullable)convertUser
188189 for (NSDictionary *storedCrumb in storedBreadcrumbs) {
189190 SentryBreadcrumb *crumb = [[SentryBreadcrumb alloc ]
190191 initWithLevel: [self sentryLevelFromString: storedCrumb[@" level"
191- category: storedCrumb[@" category"
192+ category: storedCrumb[@" category"
193+ ?: @" default" // The default value is the same as the one in
194+ // SentryBreadcrumb.init
192195 crumb.message = storedCrumb[@" message"
193196 crumb.type = storedCrumb[@" type"
194197 crumb.origin = storedCrumb[@" origin"
195- crumb.timestamp = sentry_fromIso8601String (storedCrumb[@" timestamp"
198+ if ([storedCrumb[@" timestamp" isKindOfClass: NSString .class]) {
199+ crumb.timestamp = sentry_fromIso8601String (
200+ SENTRY_UNWRAP_NULLABLE (NSString , storedCrumb[@" timestamp"
201+ }
196202 crumb.data = storedCrumb[@" data"
197203 [breadcrumbs addObject: crumb];
198204 }
@@ -248,14 +254,32 @@ - (NSDictionary *)binaryImageForAddress:(uintptr_t)address
248254 return result;
249255}
250256
257+ /* *
258+ * Creates a SentryThread from crash report thread data at the specified index.
259+ *
260+ * This method includes defensive null handling to prevent crashes when processing
261+ * malformed crash reports. The original bug was that invalid thread index types
262+ * could cause crashes when accessing threadId.intValue for isMain calculation.
263+ */
251264- (SentryThread *_Nullable)threadAtIndex : (NSInteger )threadIndex
252265{
253266 if (threadIndex >= [self .threads count ]) {
254267 return nil ;
255268 }
256269 NSDictionary *threadDictionary = self.threads [threadIndex];
257270
258- SentryThread *thread = [[SentryThread alloc ] initWithThreadId: threadDictionary[@" index"
271+ // Thread index validation: We must support nil/missing indexes for backward compatibility
272+ // with recrash reports (see testRecrashReport_WithThreadIsStringInsteadOfDict), but we
273+ // must reject invalid types when present to prevent crashes from calling .intValue on
274+ // non-NSNumber objects. This fixes a bug where malformed crash reports could cause
275+ // crashes in the converter itself when accessing threadId.intValue for isMain calculation.
276+ id threadIndexObj = threadDictionary[@" index"
277+ if (threadIndexObj != nil && ![threadIndexObj isKindOfClass: [NSNumber class ]]) {
278+ SENTRY_LOG_ERROR (@" Thread index is not a number: %@ "
279+ return nil ;
280+ }
281+ SentryThread *thread =
282+ [[SentryThread alloc ] initWithThreadId: SENTRY_UNWRAP_NULLABLE (NSNumber , threadIndexObj)];
259283 // We only want to add the stacktrace if this thread hasn't crashed
260284 thread.stacktrace = [self stackTraceForThreadIndex: threadIndex];
261285 if (thread.stacktrace .frames .count == 0 ) {
@@ -266,7 +290,10 @@ - (SentryThread *_Nullable)threadAtIndex:(NSInteger)threadIndex
266290 thread.current = threadDictionary[@" current_thread"
267291 thread.name = threadDictionary[@" name"
268292 // We don't have access to the MachineContextWrapper but we know first thread is always the main
269- thread.isMain = [NSNumber numberWithBool: thread.threadId.intValue == 0 ];
293+ // Use null-safe check: threadIndexObj can be nil for recrash reports, and calling intValue on
294+ // a nil NSNumber would return 0, incorrectly marking threads without indexes as main threads.
295+ thread.isMain =
296+ [NSNumber numberWithBool: threadIndexObj != nil && [threadIndexObj intValue ] == 0 ];
270297 if (nil == thread.name ) {
271298 thread.name = threadDictionary[@" dispatch_queue"
272299 }
@@ -357,9 +384,11 @@ - (SentryDebugMeta *)debugMetaFromBinaryImageDictionary:(NSDictionary *)sourceIm
357384
358385 for (SentryThread *thread in threads) {
359386 for (SentryFrame *frame in thread.stacktrace .frames ) {
360- if (frame.imageAddress && ![imageNames containsObject: frame.imageAddress]) {
361- [imageNames addObject: frame.imageAddress];
387+ NSString *_Nullable nullableImageAddress = frame.imageAddress ;
388+ if (nullableImageAddress == nil ) {
389+ continue ;
362390 }
391+ [imageNames addObject: SENTRY_UNWRAP_NULLABLE (NSString , nullableImageAddress)];
363392 }
364393 }
365394
@@ -399,19 +428,25 @@ - (SentryDebugMeta *)debugMetaFromBinaryImageDictionary:(NSDictionary *)sourceIm
399428 self .exceptionContext[@" mach" @" exception"
400429 self .exceptionContext[@" mach" @" code"
401430 self .exceptionContext[@" mach" @" subcode"
402- type: self .exceptionContext[@" mach" @" exception_name"
431+ type: self .exceptionContext[@" mach" @" exception_name"
432+ ?: @" Mach Exception" // The fallback value is best-attempt in case the exception
433+ // name is not available
403434 } else if ([exceptionType isEqualToString: @" signal"
404435 exception =
405436 [[SentryException alloc ] initWithValue: [NSString stringWithFormat: @" Signal %@ , Code %@ "
406437 self .exceptionContext[@" signal" @" signal"
407438 self .exceptionContext[@" signal" @" code"
408- type: self .exceptionContext[@" signal" @" name"
439+ type: self .exceptionContext[@" signal" @" name"
440+ ?: @" Signal Exception" // The fallback value is best-attempt in case the
441+ // exception name is not available
409442 } else if ([exceptionType isEqualToString: @" user"
410443 NSString *exceptionReason =
411444 [NSString stringWithFormat: @" %@ " self .exceptionContext[@" reason"
412- exception = [[SentryException alloc ]
413- initWithValue: exceptionReason
414- type: self .exceptionContext[@" user_reported" @" name"
445+ exception =
446+ [[SentryException alloc ] initWithValue: exceptionReason
447+ type: self .exceptionContext[@" user_reported" @" name"
448+ ?: @" User Reported Exception" // The fallback value is best-attempt in case
449+ // the exception name is not available
415450
416451 NSRange match = [exceptionReason rangeOfString: @" :"
417452 if (match.location != NSNotFound ) {
@@ -454,7 +489,9 @@ - (SentryException *)parseNSException
454489 }
455490
456491 return [[SentryException alloc ] initWithValue: [NSString stringWithFormat: @" %@ "
457- type: self .exceptionContext[@" nsexception" @" name"
492+ type: self .exceptionContext[@" nsexception" @" name"
493+ ?: @" NSException" // The fallback value is best-attempt in case the exception name is
494+ // not available
458495}
459496
460497- (void )enhanceValueFromNotableAddresses : (SentryException *)exception
@@ -464,15 +501,15 @@ - (void)enhanceValueFromNotableAddresses:(SentryException *)exception
464501 return ;
465502 }
466503 NSDictionary *crashedThread = self.threads [self .crashedThreadIndex];
467- NSDictionary *notableAddresses = crashedThread[@" notable_addresses"
504+ NSDictionary *_Nullable notableAddresses = crashedThread[@" notable_addresses"
468505 NSMutableOrderedSet *reasons = [[NSMutableOrderedSet alloc ] init ];
469506 if (nil != notableAddresses) {
470507 for (id key in notableAddresses) {
471508 NSDictionary *content = notableAddresses[key];
472509 if ([content[@" type" isEqualToString: @" string" nil != content[@" value"
473510 // if there are less than 3 slashes it shouldn't be a filepath
474511 if ([[content[@" value" componentsSeparatedByString: @" /" count ] < 3 ) {
475- [reasons addObject: content[@" value"
512+ [reasons addObject: SENTRY_UNWRAP_NULLABLE ( NSString , content[@" value" ) ];
476513 }
477514 }
478515 }
@@ -497,11 +534,13 @@ - (void)enhanceValueFromCrashInfoMessage:(SentryException *)exception
497534
498535 for (NSDictionary *binaryImage in libSwiftCoreBinaryImages) {
499536 if (binaryImage[@" crash_info_message" nil ) {
500- [crashInfoMessages addObject: binaryImage[@" crash_info_message"
537+ [crashInfoMessages
538+ addObject: SENTRY_UNWRAP_NULLABLE (NSString , binaryImage[@" crash_info_message"
501539 }
502540
503541 if (binaryImage[@" crash_info_message2" nil ) {
504- [crashInfoMessages addObject: binaryImage[@" crash_info_message2"
542+ [crashInfoMessages
543+ addObject: SENTRY_UNWRAP_NULLABLE (NSString , binaryImage[@" crash_info_message2"
505544 }
506545 }
507546
0 commit comments