Merge pull request #1163 from bugsnag/release-v6.10.4

Release v6.10.4

.buildkite/pipeline.full.yml

@@ -271,9 +271,9 @@ steps:
       - echo "--- Pod install"
       - pod install
       - echo "+++ Build Release iOS"
-      - xcodebuild -workspace Bugsnag\ Test\ App.xcworkspace -scheme Bugsnag\ Test\ App -configuration Release -destination generic/platform=iOS -derivedDataPath DerivedData -quiet build GCC_TREAT_WARNINGS_AS_ERRORS=YES
+      - xcodebuild -workspace objective-c-ios.xcworkspace -scheme objective-c-ios -configuration Release -destination generic/platform=iOS -derivedDataPath DerivedData -quiet build GCC_TREAT_WARNINGS_AS_ERRORS=YES
       - echo "+++ Build Debug iOS Simulator"
-      - xcodebuild -workspace Bugsnag\ Test\ App.xcworkspace -scheme Bugsnag\ Test\ App -configuration Debug -destination generic/platform=iOS\ Simulator -derivedDataPath DerivedData -quiet build GCC_TREAT_WARNINGS_AS_ERRORS=YES
+      - xcodebuild -workspace objective-c-ios.xcworkspace -scheme objective-c-ios -configuration Debug -destination generic/platform=iOS\ Simulator -derivedDataPath DerivedData -quiet build GCC_TREAT_WARNINGS_AS_ERRORS=YES
 
   - label: 'examples/objective-c-osx'
     agents:
@@ -295,9 +295,9 @@ steps:
       - echo "--- Pod install"
       - pod install
       - echo "+++ Build Release iOS"
-      - xcodebuild -workspace bugsnag-example.xcworkspace -scheme bugsnag-example -configuration Release -destination generic/platform=iOS -derivedDataPath DerivedData -quiet build GCC_TREAT_WARNINGS_AS_ERRORS=YES
+      - xcodebuild -workspace swift-ios.xcworkspace -scheme swift-ios -configuration Release -destination generic/platform=iOS -derivedDataPath DerivedData -quiet build GCC_TREAT_WARNINGS_AS_ERRORS=YES
       - echo "+++ Build Debug iOS Simulator"
-      - xcodebuild -workspace bugsnag-example.xcworkspace -scheme bugsnag-example -configuration Debug -destination generic/platform=iOS\ Simulator -derivedDataPath DerivedData -quiet build GCC_TREAT_WARNINGS_AS_ERRORS=YES
+      - xcodebuild -workspace swift-ios.xcworkspace -scheme swift-ios -configuration Debug -destination generic/platform=iOS\ Simulator -derivedDataPath DerivedData -quiet build GCC_TREAT_WARNINGS_AS_ERRORS=YES
 
   - label: 'examples/swift-package-manager'
     agents:

.jazzy.yaml

@@ -2,11 +2,11 @@ author_url: "https://www.bugsnag.com"
 author: "Bugsnag Inc"
 clean: false # avoid deleting docs/.git
 framework_root: "Bugsnag"
-github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.10.3/Bugsnag"
+github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.10.4/Bugsnag"
 github_url: "https://github.com/bugsnag/bugsnag-cocoa"
 hide_documentation_coverage: true
 module: "Bugsnag"
-module_version: "6.10.3"
+module_version: "6.10.4"
 objc: true
 output: "docs"
 readme: "README.md"

Bugsnag.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "Bugsnag",
-  "version": "6.10.3",
+  "version": "6.10.4",
   "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.10.3"
+    "tag": "v6.10.4"
   },
   "frameworks": [
     "Foundation",

Bugsnag/Breadcrumbs/BugsnagBreadcrumbs.m

@@ -157,8 +157,11 @@ - (void)addBreadcrumbWithData:(NSData *)data writeToDisk:(BOOL)writeToDisk {
         dispatch_async(BSGGlobalsFileSystemQueue(), ^{
             // Avoid writing breadcrumbs that have already been deleted from the in-memory store.
             // This can occur when breadcrumbs are being added faster than they can be written.
-            unsigned int nextFileNumber = self.nextFileNumber;
-            BOOL isStale = (self.maxBreadcrumbs < nextFileNumber) && (fileNumber < (nextFileNumber - self.maxBreadcrumbs));
+            BOOL isStale;
+            @synchronized (self) {
+                unsigned int nextFileNumber = self.nextFileNumber;
+                isStale = (self.maxBreadcrumbs < nextFileNumber) && (fileNumber < (nextFileNumber - self.maxBreadcrumbs));
+            }
 
             NSError *error = nil;
 

Bugsnag/Payload/BugsnagNotifier.m

@@ -23,7 +23,7 @@ - (instancetype)init {
 #else
         self.name = @"Bugsnag Objective-C";
 #endif
-        self.version = @"6.10.3";
+        self.version = @"6.10.4";
         self.url = @"https://github.com/bugsnag/bugsnag-cocoa";
         self.dependencies = [NSMutableArray new];
     }

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## 6.10.4 (2021-08-11)
+
+### Bug fixes
+
+* Fix ThreadSanitizer data race in `BugsnagBreadcrumbs`.
+  [#1160](https://github.com/bugsnag/bugsnag-cocoa/pull/1160)
+
 ## 6.10.3 (2021-08-04)
 
 ### Bug fixes

Framework/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.10.3</string>
+	<string>6.10.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

Tests/BugsnagBreadcrumbsTest.m

@@ -451,6 +451,10 @@ - (void)testCrashReportWriter {
 }
 
 - (void)testCrashReportWriterConcurrency {
+#if defined(__has_feature) && __has_feature(thread_sanitizer)
+    NSLog(@"Skipping test because ThreadSanitizer deadlocks if other threads are suspended");
+    return;
+#endif
     //
     // The aim of this test is to ensure that BugsnagBreadcrumbsWriteCrashReport will insert only valid JSON
     // into a crash report when other threads are (paused while) updating the breadcrumbs linked list.

Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.10.3</string>
+	<string>6.10.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

VERSION

@@ -1 +1 @@
-6.10.3
+6.10.4

examples/objective-c-ios/Podfile

@@ -1,4 +1,4 @@
-target 'Bugsnag Test App' do
+target 'objective-c-ios' do
     platform :ios, "9.3"
     pod 'Bugsnag', :path => "../.."
 end