Add additional requestContext and requestContext.RouteData null c…

…hecks - #6
aspnet · Oct 17, 2017 · 3482799 · 3482799
1 parent 2667ae2
commit 3482799
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/System.Web.Mvc/DefaultControllerFactory.cs b/src/System.Web.Mvc/DefaultControllerFactory.cs
@@ -141,7 +141,8 @@ public virtual IController CreateController(RequestContext requestContext, strin
                 throw new ArgumentNullException("requestContext");
             }
 
-            if (String.IsNullOrEmpty(controllerName) && !requestContext.RouteData.HasDirectRouteMatch())
+            if (String.IsNullOrEmpty(controllerName) &&
+                (requestContext.RouteData == null || !requestContext.RouteData.HasDirectRouteMatch()))
             {
                 throw new ArgumentException(MvcResources.Common_NullOrEmpty, "controllerName");
             }
@@ -153,6 +154,10 @@ public virtual IController CreateController(RequestContext requestContext, strin
 
         protected internal virtual IController GetControllerInstance(RequestContext requestContext, Type controllerType)
         {
+            if (requestContext == null)
+            {
+                throw new ArgumentNullException("requestContext");
+            }
             if (controllerType == null)
             {
                 throw new HttpException(404,
@@ -170,6 +175,7 @@ protected internal virtual IController GetControllerInstance(RequestContext requ
                         controllerType),
                     "controllerType");
             }
+
             return ControllerActivator.Create(requestContext, controllerType);
         }
 
@@ -214,7 +220,7 @@ protected internal virtual Type GetControllerType(RequestContext requestContext,
             // first search in the current route's namespace collection
             object routeNamespacesObj;
             Type match;
-            if (routeData.DataTokens.TryGetValue(RouteDataTokenKeys.Namespaces, out routeNamespacesObj))
+            if (routeData != null && routeData.DataTokens.TryGetValue(RouteDataTokenKeys.Namespaces, out routeNamespacesObj))
             {
                 IEnumerable<string> routeNamespaces = routeNamespacesObj as IEnumerable<string>;
                 if (routeNamespaces != null && routeNamespaces.Any())
@@ -232,18 +238,19 @@ protected internal virtual Type GetControllerType(RequestContext requestContext,
             }
 
             // then search in the application's default namespace collection
+            RouteBase route = routeData == null ? null : routeData.Route;
             if (ControllerBuilder.DefaultNamespaces.Count > 0)
             {
                 HashSet<string> namespaceDefaults = new HashSet<string>(ControllerBuilder.DefaultNamespaces, StringComparer.OrdinalIgnoreCase);
-                match = GetControllerTypeWithinNamespaces(routeData.Route, controllerName, namespaceDefaults);
+                match = GetControllerTypeWithinNamespaces(route, controllerName, namespaceDefaults);
                 if (match != null)
                 {
                     return match;
                 }
             }
 
             // if all else fails, search every namespace
-            return GetControllerTypeWithinNamespaces(routeData.Route, controllerName, null /* namespaces */);
+            return GetControllerTypeWithinNamespaces(route, controllerName, null /* namespaces */);
         }
 
         private static Type GetControllerTypeFromDirectRoute(RouteData routeData)