fixing possible NRE, when viewContext is null

m0sa · pranavkm · commit bc009fc0f180 · 2019-03-08T15:02:02.000-08:00
diff --git a/src/Mvc/Mvc.Razor/src/RazorPageBase.cs b/src/Mvc/Mvc.Razor/src/RazorPageBase.cs
@@ -644,9 +644,11 @@ public virtual async Task<HtmlString> FlushAsync()
         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;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -644,9 +644,11 @@ public virtual async Task<HtmlString> FlushAsync()`
`644`	`644`	`public virtual HtmlString SetAntiforgeryCookieAndHeader()`
`645`	`645`	`{`
`646`	`646`	`var viewContext = ViewContext;`
`647`		`- var antiforgery = viewContext?.HttpContext.RequestServices.GetRequiredService<IAntiforgery>();`
`648`		`- antiforgery.SetCookieTokenAndHeader(viewContext?.HttpContext);`
`649`		`-`
	`647`	`+ if (viewContext != null)`
	`648`	`+ {`
	`649`	`+ var antiforgery = viewContext.HttpContext.RequestServices.GetRequiredService<IAntiforgery>();`
	`650`	`+ antiforgery.SetCookieTokenAndHeader(viewContext.HttpContext);`
	`651`	`+ }`
`650`	`652`	`return HtmlString.Empty;`
`651`	`653`	`}`
`652`	`654`