Fixes #268, no guard clause checking to ensure "name" or "HtmlHelper"…

… dictionary keys exist before they are used.
maartenba · Jan 29, 2014 · fc1d93c · fc1d93c
1 parent fbf33af
commit fc1d93c
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/MvcSiteMapProvider/MvcSiteMapProvider/FilteredSiteMapNodeVisibilityProvider.cs b/src/MvcSiteMapProvider/MvcSiteMapProvider/FilteredSiteMapNodeVisibilityProvider.cs
@@ -36,15 +36,28 @@ public override bool IsVisible(ISiteMapNode node, IDictionary<string, object> so
             }
             visibility = visibility.Trim();
 
-            // Check for the source HtmlHelper
-            if (sourceMetadata["HtmlHelper"] == null)
+            string name = string.Empty;
+            string htmlHelper = string.Empty;
+            if (sourceMetadata.ContainsKey("name"))
+            {
+                name = Convert.ToString(sourceMetadata["name"]);
+            }
+            if (sourceMetadata.ContainsKey("HtmlHelper"))
+            {
+                htmlHelper = Convert.ToString(sourceMetadata["HtmlHelper"]);
+            }
+
+            // Check for the source HtmlHelper or given name. If neither are configured,
+            // then always visible.
+            if (string.IsNullOrEmpty(name) && string.IsNullOrEmpty(htmlHelper))
             {
                 return true;
             }
-            string name = Convert.ToString(sourceMetadata["name"]);
-            string htmlHelper = Convert.ToString(sourceMetadata["HtmlHelper"]);
+
+            // Chop off the namespace
             htmlHelper = htmlHelper.Substring(htmlHelper.LastIndexOf(".") + 1);
 
+            // Get the keywords
             var visibilityKeywords = visibility.Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries);
 
             // All set. Now parse the visibility variable.