Merge branch 'master' into next

bugsnag · Sep 25, 2020 · 5d918d4 · 5d918d4
2 parents 079cdfb + 0dcb5b9
commit 5d918d4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/Bugsnag.podspec.json b/Bugsnag.podspec.json
@@ -1,6 +1,6 @@
 {
   "name": "Bugsnag",
-  "version": "6.1.5",
+  "version": "6.1.6",
   "summary": "The Bugsnag crash reporting framework for Apple platforms.",
   "homepage": "https://bugsnag.com",
   "license": "MIT",
@@ -9,7 +9,7 @@
   },
   "source": {
     "git": "https://github.com/bugsnag/bugsnag-cocoa.git",
-    "tag": "v6.1.5"
+    "tag": "v6.1.6"
   },
   "frameworks": [
     "Foundation",

diff --git a/Bugsnag/BSGOutOfMemoryWatchdog.m b/Bugsnag/BSGOutOfMemoryWatchdog.m
@@ -274,7 +274,7 @@ - (NSDictionary *)readSentinelFile {
         bsg_log_err(@"Failed to read oom watchdog file: %@", error);
         return nil;
     }
-    NSDictionary *contents = [BSGJSONSerialization JSONObjectWithData:data options:0 error:&error];
+    NSMutableDictionary *contents = [BSGJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&error];
     if (error) {
         bsg_log_err(@"Failed to read oom watchdog file: %@", error);
         return nil;

diff --git a/Bugsnag/Payload/BugsnagNotifier.m b/Bugsnag/Payload/BugsnagNotifier.m
@@ -23,7 +23,7 @@ - (instancetype)init {
 #else
         self.name = @"Bugsnag Objective-C";
 #endif
-        self.version = @"6.1.5";
+        self.version = @"6.1.6";
         self.url = @"https://github.com/bugsnag/bugsnag-cocoa";
         self.dependencies = [NSMutableArray new];
     }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## 6.1.6 (2020-09-24)
+
+### Bug fixes
+
+* Fix crash-on-launch (attempt to insert into immutable dictionary).
+  [819](https://github.com/bugsnag/bugsnag-cocoa/pull/819)
+
 ## 6.1.5 (2020-09-23)
 
 ### Enhancements

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.1.5
+6.1.6