Check MACH_PORT_VALID on return from pthread_mach_thread_np

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 ## Unreleased
+
+### Fixes
+
+- Check MACH_PORT_VALID on return from pthread_mach_thread_np (#3520)
 
 ### Features
 

Sources/Sentry/PrivateSentrySDKOnly.mm

@@ -140,11 +140,10 @@ + (uint64_t)startProfilerForTrace:(SentryId *)traceId;
                                         onHub:[SentrySDK currentHub]];
 
     if (payload != nil) {
+        const auto thread = sentry::profiling::ThreadHandle::current();
         payload[@"platform"] = SentryPlatformName;
-        payload[@"transaction"] = @{
-            @"active_thread_id" :
-                [NSNumber numberWithLongLong:sentry::profiling::ThreadHandle::current()->tid()]
-        };
+        payload[@"transaction"] =
+            @{ @"active_thread_id" : (thread == nullptr) ? @0 : @(thread->tid()) };
     }
 
     return payload;

Sources/Sentry/SentryThreadHandle.cpp

@@ -45,6 +45,9 @@ namespace profiling {
     ThreadHandle::current() noexcept
     {
         const auto thread = pthread_mach_thread_np(pthread_self());
+        if (!MACH_PORT_VALID(thread)) {
+            return nullptr;
+        }
         return std::make_unique<ThreadHandle>(thread);
     }
 
@@ -74,6 +77,10 @@ namespace profiling {
         mach_msg_type_number_t count;
         thread_act_array_t list;
         auto current = ThreadHandle::current();
+        if (current == nullptr) {
+            return std::make_pair(threads, nullptr);
+        }
+
         if (SENTRY_PROF_LOG_KERN_RETURN(task_threads(mach_task_self(), &list, &count))
             == KERN_SUCCESS) {
             for (decltype(count) i = 0; i < count; i++) {

Sources/Sentry/SentryTransactionContext.mm

@@ -124,8 +124,9 @@ - (instancetype)initWithName:(NSString *)name
 - (void)getThreadInfo
 {
 #if SENTRY_TARGET_PROFILING_SUPPORTED
-    const auto threadID = sentry::profiling::ThreadHandle::current()->tid();
-    self.threadInfo = [[SentryThread alloc] initWithThreadId:@(threadID)];
+    const auto thread = sentry::profiling::ThreadHandle::current();
+    self.threadInfo =
+        [[SentryThread alloc] initWithThreadId:(thread == nullptr) ? @0 : @(thread->tid())];
 #endif
 }
 

Sources/Sentry/include/SentryThreadHandle.hpp

@@ -56,6 +56,8 @@ namespace profiling {
         /**
          * @return A handle to the currently executing thread, which is acquired
          * in a non async-signal-safe manner.
+         *
+         * Returns nullptr if the current thread could not be retrieved.
          */
         static std::unique_ptr<ThreadHandle> current() noexcept;
 
@@ -69,6 +71,8 @@ namespace profiling {
          * the threads in the current process, excluding the current thread (the
          * thread that this function is being called on), and the second element
          * is a handle to the current thread.
+         *
+         * Returns ({}, nullptr) if the current thread could not be retrieved.
          */
         static std::pair<std::vector<std::unique_ptr<ThreadHandle>>, std::unique_ptr<ThreadHandle>>
         allExcludingCurrent() noexcept;