fix: EXC_BAD_ACCESS in SentryMetricProfiler (#4242)

Add missing synchronize block around the clear method.
getsentry · Aug 7, 2024 · 6a6a5b2 · 6a6a5b2
1 parent 4b1113e
commit 6a6a5b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ This bug caused unhandled/crash events to have the unhandled property and mach i
 - Missing mach info for crash reports (#4230)
 - Crash reports not generated on visionOS (#4229)
 - Don’t force cast to `NSComparisonPredicate` in TERNARY operator (#4232)
+- EXC_BAD_ACCESS in SentryMetricProfiler (#4242)
 - Missing '#include <sys/_types/_ucontext64.h>' (#4244)
 
 ### Improvements

diff --git a/Sources/Sentry/SentryMetricProfiler.mm b/Sources/Sentry/SentryMetricProfiler.mm
@@ -113,7 +113,8 @@ @implementation SentryMetricProfiler {
 - (instancetype)initWithMode:(SentryProfilerMode)mode
 {
  if (self = [super init]) {
- [self clear];
+ // It doesn't make sense to acquire a lock in the init.
+ [self clearNotThreadSafe];
  _mode = mode;
  }
  return self;
@@ -210,6 +211,13 @@ - (void)stop
 }
 
 - (void)clear
+{
+ @synchronized(self) {
+ [self clearNotThreadSafe];
+ }
+}
+
+- (void)clearNotThreadSafe
 {
  _cpuUsage = [NSMutableArray<SentryMetricReading *> array];
  _memoryFootprint = [NSMutableArray<SentryMetricReading *> array];

diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c b/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c
@@ -38,7 +38,7 @@
 #include "SentryAsyncSafeLog.h"
 
 #ifdef __arm64__
-#include <sys/_types/_ucontext64.h>
+# include <sys/_types/_ucontext64.h>
 # define UC_MCONTEXT uc_mcontext64
 typedef ucontext64_t SignalUserContext;
 #else