From bc009fc0f180532e003b7d3e466c5a1a2456a630 Mon Sep 17 00:00:00 2001
From: sprelog <sprelog@stackoverflow.com>
Date: Fri, 8 Mar 2019 18:48:18 +0100
Subject: [PATCH] fixing possible NRE, when viewContext is null

---
 src/Mvc/Mvc.Razor/src/RazorPageBase.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Mvc/Mvc.Razor/src/RazorPageBase.cs b/src/Mvc/Mvc.Razor/src/RazorPageBase.cs
index f8277dca22..392455db59 100644
--- a/src/Mvc/Mvc.Razor/src/RazorPageBase.cs
+++ b/src/Mvc/Mvc.Razor/src/RazorPageBase.cs
@@ -644,9 +644,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor
         public virtual HtmlString SetAntiforgeryCookieAndHeader()
         {
             var viewContext = ViewContext;
-            var antiforgery = viewContext?.HttpContext.RequestServices.GetRequiredService<IAntiforgery>();
-            antiforgery.SetCookieTokenAndHeader(viewContext?.HttpContext);
-
+            if (viewContext != null)
+            {
+                var antiforgery = viewContext.HttpContext.RequestServices.GetRequiredService<IAntiforgery>();
+                antiforgery.SetCookieTokenAndHeader(viewContext.HttpContext);
+            }
             return HtmlString.Empty;
         }