Merge pull request #468 from bugsnag/cocoa-5.23.4-bump

Release 2.23.10
bugsnag · Jul 13, 2020 · 466d2ae · 466d2ae
2 parents 0c282f0 + 066d37c
commit 466d2ae
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,20 @@
 Changelog
 =========
 
+## 2.23.10 (2020-07-13)
+
+## Bug fixes
+
+* (iOS) Fix incorrect string comparison of thread names in Mach exception handling
+  [#721](https://github.com/bugsnag/bugsnag-cocoa/pull/721)
+
+* (iOS) Move binary images store declaration from header file
+  [#725](https://github.com/bugsnag/bugsnag-cocoa/pull/725)
+
+* (iOS) Avoid dereference null pointer in JSON serialisation
+  [#637](https://github.com/bugsnag/bugsnag-cocoa/pull/637)
+  [Naugladur](https://github.com/Naugladur)
+
 ## 2.23.9 (2020-06-08)
 
 ## Bug fixes

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Bugsnag error monitoring & exception reporter for React Native
-[![Documentation](https://img.shields.io/badge/documentation-2.23.9-blue.svg)](http://docs.bugsnag.com/platforms/react-native/)
+[![Documentation](https://img.shields.io/badge/documentation-2.23.10-blue.svg)](http://docs.bugsnag.com/platforms/react-native/)
 
 Automatic [React Native crash reporting](https://www.bugsnag.com/platforms/react-native-error-reporting/) with Bugsnag helps you detect both native OS and JavaScript errors in your React Native apps.
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -23,7 +23,7 @@ android {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', 28)
         versionCode 4
-        versionName '2.23.9'
+        versionName '2.23.10'
         consumerProguardFiles 'proguard-rules.pro'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/cocoa/vendor/bugsnag-cocoa/Source/BugsnagNotifier.m b/cocoa/vendor/bugsnag-cocoa/Source/BugsnagNotifier.m
@@ -47,7 +47,7 @@
 #import <AppKit/AppKit.h>
 #endif
 
-NSString *const NOTIFIER_VERSION = @"5.23.3";
+NSString *const NOTIFIER_VERSION = @"5.23.4";
 NSString *const NOTIFIER_URL = @"https://github.com/bugsnag/bugsnag-cocoa";
 NSString *const BSTabCrash = @"crash";
 NSString *const BSAttributeDepth = @"depth";

diff --git a/cocoa/vendor/bugsnag-cocoa/Source/KSCrash/Source/KSCrash/Recording/BSG_KSCrashReportStore.m b/cocoa/vendor/bugsnag-cocoa/Source/KSCrash/Source/KSCrash/Recording/BSG_KSCrashReportStore.m
@@ -83,9 +83,10 @@ - (NSDictionary *)fileWithId:(NSString *)fileId {
     if (dict != nil) {
         return dict;
     } else {
+        NSError *error = nil;
         NSMutableDictionary *fileContents = [NSMutableDictionary new];
         NSMutableDictionary *recrashReport =
-                [self readFile:[self pathToRecrashReportWithID:fileId] error:nil];
+                [self readFile:[self pathToRecrashReportWithID:fileId] error:&error];
         BSGDictInsertIfNotNil(fileContents, recrashReport, @BSG_KSCrashField_RecrashReport);
         return fileContents;
     }

diff --git a/...ag-cocoa/Source/KSCrash/Source/KSCrash/Recording/Sentry/BSG_KSCrashSentry_MachException.c b/...ag-cocoa/Source/KSCrash/Source/KSCrash/Recording/Sentry/BSG_KSCrashSentry_MachException.c
@@ -206,7 +206,7 @@ void *ksmachexc_i_handleExceptions(void *const userData) {
 
     const char *threadName = (const char *)userData;
     pthread_setname_np(threadName);
-    if (threadName == kThreadSecondary) {
+    if (strcmp(threadName, kThreadSecondary) == 0) {
         BSG_KSLOG_DEBUG("This is the secondary thread. Suspending.");
         thread_suspend(bsg_ksmachthread_self());
     }

diff --git a/cocoa/vendor/bugsnag-cocoa/Source/KSCrash/Source/KSCrash/Recording/Tools/BSG_KSMachHeaders.h b/cocoa/vendor/bugsnag-cocoa/Source/KSCrash/Source/KSCrash/Recording/Tools/BSG_KSMachHeaders.h
@@ -36,7 +36,6 @@ typedef struct {
     BSG_Mach_Binary_Image_Info *contents;
 } BSG_Mach_Binary_Images;
 
-static BSG_Mach_Binary_Images bsg_mach_binary_images;
 
 // MARK: - Locking
 

diff --git a/cocoa/vendor/bugsnag-cocoa/Source/KSCrash/Source/KSCrash/Recording/Tools/BSG_KSMachHeaders.m b/cocoa/vendor/bugsnag-cocoa/Source/KSCrash/Source/KSCrash/Recording/Tools/BSG_KSMachHeaders.m
@@ -14,6 +14,8 @@
 
 // MARK: - Locking
 
+static BSG_Mach_Binary_Images bsg_mach_binary_images;
+
 // Pragma's hide unavoidable (and expected) deprecation/unavailable warnings
 _Pragma("clang diagnostic push")
 _Pragma("clang diagnostic ignored \"-Wunguarded-availability\"")

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "homepage": "https://www.bugsnag.com/platforms/react-native-error-reporting/",
   "repository": "https://github.com/bugsnag/bugsnag-react-native.git",
   "bugs": "https://github.com/bugsnag/bugsnag-react-native/issues",
-  "version": "2.23.9",
+  "version": "2.23.10",
   "license": "MIT",
   "main": "index.js",
   "types": "index.d.ts",