Fix GetRelatedActivityID assert (#2163)

microsoft · Feb 6, 2025 · 69b069a · 69b069a
1 parent 08fd134
commit 69b069a
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/TraceEvent/TraceEvent.cs b/src/TraceEvent/TraceEvent.cs
@@ -542,13 +542,16 @@ internal virtual string ProcessName(int processID, long timeQPC)
         internal virtual int LastChanceGetProcessID(TraceEvent data) { return -1; }
         internal virtual unsafe Guid GetRelatedActivityID(TraceEventNativeMethods.EVENT_RECORD* eventRecord)
         {
-            var extendedData = eventRecord->ExtendedData;
-            Debug.Assert((ulong)extendedData > 0x10000);          // Make sure this looks like a pointer.  
-            for (int i = 0; i < eventRecord->ExtendedDataCount; i++)
+            if (eventRecord->ExtendedDataCount != 0)
             {
-                if (extendedData[i].ExtType == TraceEventNativeMethods.EVENT_HEADER_EXT_TYPE_RELATED_ACTIVITYID)
+                var extendedData = eventRecord->ExtendedData;
+                Debug.Assert((ulong)extendedData > 0x10000);          // Make sure this looks like a pointer.  
+                for (int i = 0; i < eventRecord->ExtendedDataCount; i++)
                 {
-                    return *((Guid*)extendedData[i].DataPtr);
+                    if (extendedData[i].ExtType == TraceEventNativeMethods.EVENT_HEADER_EXT_TYPE_RELATED_ACTIVITYID)
+                    {
+                        return *((Guid*)extendedData[i].DataPtr);
+                    }
                 }
             }