From 490e4c13e071b74b5e3869e317b2f6125d63e49b Mon Sep 17 00:00:00 2001
From: Mackinnon Buck <mackinnon.buck@gmail.com>
Date: Fri, 21 Apr 2023 11:31:11 -0700
Subject: [PATCH] Check for 'null' arguments in
 HttpContextServerVariableExtensions.GetServerVariable

We received a bug report where a customer got a NRE with this method being the source. This PR makes a nicer exception get thrown instead.
---
 .../Http.Extensions/src/HttpContextServerVariableExtensions.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Http/Http.Extensions/src/HttpContextServerVariableExtensions.cs b/src/Http/Http.Extensions/src/HttpContextServerVariableExtensions.cs
index 2e7bdd209015..19bb492b1843 100644
--- a/src/Http/Http.Extensions/src/HttpContextServerVariableExtensions.cs
+++ b/src/Http/Http.Extensions/src/HttpContextServerVariableExtensions.cs
@@ -21,6 +21,9 @@ public static class HttpContextServerVariableExtensions
     /// </returns>
     public static string? GetServerVariable(this HttpContext context, string variableName)
     {
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(variableName);
+        
         var feature = context.Features.Get<IServerVariablesFeature>();
 
         if (feature == null)