From 0136c49d0f1d76133d9098ba2e6a07feda3139c4 Mon Sep 17 00:00:00 2001
From: Nolan Glore <nglore@microsoft.com>
Date: Wed, 30 Aug 2023 21:31:35 -0700
Subject: [PATCH] Fixup pRequestInfo after GCs

---
 src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs b/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs
index 51e734bf504a..c4475d5eb5a5 100644
--- a/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs
+++ b/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs
@@ -553,9 +553,12 @@ private IReadOnlyDictionary<int, ReadOnlyMemory<byte>> GetRequestInfo(IntPtr bas
 
             var info = new Dictionary<int, ReadOnlyMemory<byte>>(count);
 
+            long fixup = (byte*)nativeRequest - (byte*)baseAddress;
+            var pRequestInfo = (HttpApiTypes.HTTP_REQUEST_INFO*)((byte*)nativeRequest->pRequestInfo + fixup);
+
             for (var i = 0; i < count; i++)
             {
-                var requestInfo = nativeRequest->pRequestInfo[i];
+                var requestInfo = pRequestInfo[i];
                 var offset = (long)requestInfo.pInfo - (long)baseAddress;
                 info.Add(
                     (int)requestInfo.InfoType,