guard against NRE's in FindView

mythz · mythz · commit 46859a6f9377 · 2019-09-18T12:32:26.000-04:00
diff --git a/src/ServiceStack.Mvc/RazorFormat.cs b/src/ServiceStack.Mvc/RazorFormat.cs
@@ -354,11 +354,11 @@ private ViewEngineResult FindView(IEnumerable<string> viewNames, out Dictionary<
                 if (viewName.StartsWith("/"))
                 {
                     var viewEngineResult = GetPageFromPathInfo(viewName);                
-                    if (viewEngineResult.Success)
+                    if (viewEngineResult?.Success == true)
                         return viewEngineResult;
             
                     viewEngineResult = GetRoutingPage(viewName, out routingArgs);                
-                    if (viewEngineResult.Success)
+                    if (viewEngineResult?.Success == true)
                         return viewEngineResult;
                 }
                 else
@@ -367,7 +367,7 @@ private ViewEngineResult FindView(IEnumerable<string> viewNames, out Dictionary<
                     {
                         var viewPath = location.CombineWith(viewName) + ".cshtml";
                         var viewEngineResult = ViewEngine.GetView(execPath, viewPath, isMainPage: false);
-                        if (viewEngineResult.Success)
+                        if (viewEngineResult?.Success == true)
                             return viewEngineResult;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -354,11 +354,11 @@ private ViewEngineResult FindView(IEnumerable<string> viewNames, out Dictionary<`
`354`	`354`	`if (viewName.StartsWith("/"))`
`355`	`355`	`{`
`356`	`356`	`var viewEngineResult = GetPageFromPathInfo(viewName);`
`357`		`- if (viewEngineResult.Success)`
	`357`	`+ if (viewEngineResult?.Success == true)`
`358`	`358`	`return viewEngineResult;`
`359`	`359`
`360`	`360`	`viewEngineResult = GetRoutingPage(viewName, out routingArgs);`
`361`		`- if (viewEngineResult.Success)`
	`361`	`+ if (viewEngineResult?.Success == true)`
`362`	`362`	`return viewEngineResult;`
`363`	`363`	`}`
`364`	`364`	`else`
`@@ -367,7 +367,7 @@ private ViewEngineResult FindView(IEnumerable<string> viewNames, out Dictionary<`
`367`	`367`	`{`
`368`	`368`	`var viewPath = location.CombineWith(viewName) + ".cshtml";`
`369`	`369`	`var viewEngineResult = ViewEngine.GetView(execPath, viewPath, isMainPage: false);`
`370`		`- if (viewEngineResult.Success)`
	`370`	`+ if (viewEngineResult?.Success == true)`
`371`	`371`	`return viewEngineResult;`
`372`	`372`	`}`
`373`	`373`	`}`