Merge pull request #1514 from bugsnag/PLAT-9367-thermal-state-workaround

Plat 9367 thermal state workaround
bugsnag · Jan 11, 2023 · 68b51af · 68b51af
2 parents 8f89a59 + fd4851c
commit 68b51af
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/Bugsnag/Helpers/BSGRunContext.m b/Bugsnag/Helpers/BSGRunContext.m
@@ -258,11 +258,16 @@ static void NoteThermalState(__unused CFNotificationCenterRef center,
                              __unused CFNotificationName name,
                              const void *object,
                              __unused CFDictionaryRef userInfo) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-    bsg_runContext->thermalState = ((__bridge NSProcessInfo *)object).thermalState;
-#pragma clang diagnostic pop
-    BSGRunContextUpdateTimestamp();
+    if (@available(iOS 11.0, tvOS 11.0, watchOS 4.0, *)) {
+        // Workaround for iOS 15.0.2 to 15.1.1: Foundation in rare cases posts
+        // ThermalStateDidChangeNotification from within -[NSProcessInfo thermalState],
+        // causing recursion and a crash via _os_unfair_lock_recursive_abort().
+        // To avoid this, grab the new thermal state asynchronously.
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            bsg_runContext->thermalState = ((__bridge NSProcessInfo *)object).thermalState;
+            BSGRunContextUpdateTimestamp();
+        });
+    }
 }
 
 #if BSG_HAVE_OOM_DETECTION

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+## TBD
+
+### Bug fixes
+
+* Workaround for thermal state lock re-entry bug on iOS 15.0.2-15.1.1.
+  [1514]https://github.com/bugsnag/bugsnag-cocoa/pull/1514
+
+* Clean up compiler warnings about data races and nullability.
+  [1515](https://github.com/bugsnag/bugsnag-cocoa/pull/1515)
+
 ## 6.25.1 (2022-12-07)
 
 ### Bug fixes