Merge 85209f0 into 2f8b3a8

getsentry · May 12, 2023 · c8e8975 · c8e8975
2 parents 2f8b3a8 + 85209f0
commit c8e8975
Show file tree

Hide file tree

Showing 8 changed files with 382 additions and 211 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+### Fixed
+
+- Fix crashes in profiling serialization race condition (#3018)
+
+## 8.7.0
+
 ### Features
 
 - Add `sent_at` to envelope header (#2859)

diff --git a/Sources/Sentry/SentryProfileTimeseries.mm b/Sources/Sentry/SentryProfileTimeseries.mm
@@ -7,8 +7,6 @@
 #    import "SentryLog.h"
 #    import "SentryTransaction.h"
 
-std::mutex _gSamplesArrayLock;
-
 /**
  * Print a debug log to help diagnose slicing errors.
  * @param start @c YES if this is an attempt to find the start of the sliced data based on the
@@ -44,51 +42,45 @@
 NSArray<SentrySample *> *_Nullable slicedProfileSamples(
     NSArray<SentrySample *> *samples, SentryTransaction *transaction)
 {
-    NSArray<SentrySample *> *samplesCopy;
-    {
-        std::lock_guard<std::mutex> l(_gSamplesArrayLock);
-        samplesCopy = [samples copy];
-    }
-
-    if (samplesCopy.count == 0) {
+    if (samples.count == 0) {
         return nil;
     }
 
     const auto transactionStart = transaction.startSystemTime;
     const auto firstIndex =
-        [samplesCopy indexOfObjectWithOptions:NSEnumerationConcurrent
-                                  passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
-                                      BOOL *_Nonnull stop) {
-                                      *stop = sample.absoluteTimestamp >= transactionStart;
-                                      return *stop;
-                                  }];
+        [samples indexOfObjectWithOptions:NSEnumerationConcurrent
+                              passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
+                                  BOOL *_Nonnull stop) {
+                                  *stop = sample.absoluteTimestamp >= transactionStart;
+                                  return *stop;
+                              }];
 
     if (firstIndex == NSNotFound) {
-        logSlicingFailureWithArray(samplesCopy, transaction, /*start*/ YES);
+        logSlicingFailureWithArray(samples, transaction, /*start*/ YES);
         return nil;
     } else {
         SENTRY_LOG_DEBUG(@"Found first slice sample at index %lu", firstIndex);
     }
 
     const auto transactionEnd = transaction.endSystemTime;
     const auto lastIndex =
-        [samplesCopy indexOfObjectWithOptions:NSEnumerationConcurrent | NSEnumerationReverse
-                                  passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
-                                      BOOL *_Nonnull stop) {
-                                      *stop = sample.absoluteTimestamp <= transactionEnd;
-                                      return *stop;
-                                  }];
+        [samples indexOfObjectWithOptions:NSEnumerationConcurrent | NSEnumerationReverse
+                              passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
+                                  BOOL *_Nonnull stop) {
+                                  *stop = sample.absoluteTimestamp <= transactionEnd;
+                                  return *stop;
+                              }];
 
     if (lastIndex == NSNotFound) {
-        logSlicingFailureWithArray(samplesCopy, transaction, /*start*/ NO);
+        logSlicingFailureWithArray(samples, transaction, /*start*/ NO);
         return nil;
     } else {
         SENTRY_LOG_DEBUG(@"Found last slice sample at index %lu", lastIndex);
     }
 
     const auto range = NSMakeRange(firstIndex, (lastIndex - firstIndex) + 1);
     const auto indices = [NSIndexSet indexSetWithIndexesInRange:range];
-    return [samplesCopy objectsAtIndexes:indices];
+    return [samples objectsAtIndexes:indices];
 }
 
 @implementation SentrySample