[release/8.0-staging] Fix AV in HttpTelemetry.WriteEvent (#99607)

github-actions[bot] · MihaZupan · web-flow · commit 99c7022f7644 · 2024-03-21T19:50:28.000+01:00
* Fix AV in HttpTelemetry.WriteEvent

* Move descrs into fixed scope

---------

Co-authored-by: Miha Zupan &lt;mihazupan.zupan1@gmail.com&gt;
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/HttpTelemetry.cs b/src/libraries/System.Net.Http/src/System/Net/Http/HttpTelemetry.cs
@@ -339,13 +339,13 @@ private unsafe void WriteEvent(int eventId, byte arg1, byte arg2, long arg3, str
             arg5 ??= "";
             arg7 ??= "";
 
-            const int NumEventDatas = 7;
-            EventData* descrs = stackalloc EventData[NumEventDatas];
-
             fixed (char* arg4Ptr = arg4)
             fixed (char* arg5Ptr = arg5)
             fixed (char* arg7Ptr = arg7)
             {
+                const int NumEventDatas = 7;
+                EventData* descrs = stackalloc EventData[NumEventDatas];
+
                 descrs[0] = new EventData
                 {
                     DataPointer = (IntPtr)(&arg1),
@@ -381,9 +381,9 @@ private unsafe void WriteEvent(int eventId, byte arg1, byte arg2, long arg3, str
                     DataPointer = (IntPtr)arg7Ptr,
                     Size = (arg7.Length + 1) * sizeof(char)
                 };
-            }
 
-            WriteEventCore(eventId, NumEventDatas, descrs);
+                WriteEventCore(eventId, NumEventDatas, descrs);
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -339,13 +339,13 @@ private unsafe void WriteEvent(int eventId, byte arg1, byte arg2, long arg3, str`
`339`	`339`	`arg5 ??= "";`
`340`	`340`	`arg7 ??= "";`
`341`	`341`
`342`		`- const int NumEventDatas = 7;`
`343`		`- EventData* descrs = stackalloc EventData[NumEventDatas];`
`344`		`-`
`345`	`342`	`fixed (char* arg4Ptr = arg4)`
`346`	`343`	`fixed (char* arg5Ptr = arg5)`
`347`	`344`	`fixed (char* arg7Ptr = arg7)`
`348`	`345`	`{`
	`346`	`+ const int NumEventDatas = 7;`
	`347`	`+ EventData* descrs = stackalloc EventData[NumEventDatas];`
	`348`	`+`
`349`	`349`	`descrs[0] = new EventData`
`350`	`350`	`{`
`351`	`351`	`DataPointer = (IntPtr)(&arg1),`
`@@ -381,9 +381,9 @@ private unsafe void WriteEvent(int eventId, byte arg1, byte arg2, long arg3, str`
`381`	`381`	`DataPointer = (IntPtr)arg7Ptr,`
`382`	`382`	`Size = (arg7.Length + 1) * sizeof(char)`
`383`	`383`	`};`
`384`		`- }`
`385`	`384`
`386`		`- WriteEventCore(eventId, NumEventDatas, descrs);`
	`385`	`+ WriteEventCore(eventId, NumEventDatas, descrs);`
	`386`	`+ }`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`	`}`