Silently return null if the passed key to FindSiteMapNodeFromKey isn'…

…t a valid Guid
slacto · Mar 5, 2020 · b15033d · b15033d
1 parent 1c053cf
commit b15033d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Composite/AspNet/CmsPagesSiteMapPlugin.cs b/Composite/AspNet/CmsPagesSiteMapPlugin.cs
@@ -92,10 +92,16 @@ public SiteMapNode FindSiteMapNode(SiteMapProvider provider, string rawUrl)
         /// <exclude />
         public SiteMapNode FindSiteMapNodeFromKey(SiteMapProvider provider, string key)
         {
-            var pageId = new Guid(key);
-            var page = PageManager.GetPageById(pageId);
+            if (Guid.TryParse(key, out var pageId))
+            {
+                var page = PageManager.GetPageById(pageId);
+                if (page != null)
+                {
+                    return new CmsPageSiteMapNode(provider, page);
+                }
+            }
 
-            return page != null ? new CmsPageSiteMapNode(provider, page) : null;
+            return null;
         }
 
         /// <exclude />