Skip to content

Commit 5cd3872

Browse files
committed
Fix null ref in UrlGroup.Dispose due to logger not set
1 parent bda52f7 commit 5cd3872

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/Servers/HttpSys/src/NativeInterop/RequestQueue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ internal RequestQueue(string requestQueueName, string urlPrefix, ILogger logger,
2424
{
2525
try
2626
{
27-
UrlGroup = new UrlGroup(this, UrlPrefix.Create(urlPrefix));
27+
UrlGroup = new UrlGroup(this, UrlPrefix.Create(urlPrefix), logger);
2828
}
2929
catch
3030
{

src/Servers/HttpSys/src/NativeInterop/UrlGroup.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ internal unsafe UrlGroup(ServerSession serverSession, ILogger logger)
3838
Id = urlGroupId;
3939
}
4040

41-
internal unsafe UrlGroup(RequestQueue requestQueue, UrlPrefix url)
41+
internal unsafe UrlGroup(RequestQueue requestQueue, UrlPrefix url, ILogger logger)
4242
{
43+
_logger = logger;
44+
4345
ulong urlGroupId = 0;
4446
var statusCode = HttpApi.HttpFindUrlGroupId(
4547
url.FullPrefix, requestQueue.Handle, &urlGroupId);

src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,10 @@ private void SetFatalResponse(int status)
326326

327327
internal unsafe void Delegate(DelegationRule destination)
328328
{
329+
if (destination == null)
330+
{
331+
throw new ArgumentNullException(nameof(destination));
332+
}
329333
if (Request.HasRequestBodyStarted)
330334
{
331335
throw new InvalidOperationException("This request cannot be delegated, the request body has already started.");

0 commit comments

Comments
 (0)