yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adds null check and ensures that SetInternalRedirectPublishedContent cannot be called with a null result

Browse Source
This commit is contained in:
Shannon
2016-01-28 10:19:51 +01:00
parent e912238574
commit 81a99d6f7d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/Routing/PublishedContentRequest.cs
View File

@@ -166,7 +166,8 @@ namespace Umbraco.Web.Routing
/// preserve or reset the template, if any.</remarks>
public void SetInternalRedirectPublishedContent(IPublishedContent content)
{
EnsureWriteable();
if (content == null) throw new ArgumentNullException("content");
EnsureWriteable();
// unless a template has been set already by the finder,
// template should be null at that point.

6
src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
View File

@@ -515,11 +515,11 @@ namespace Umbraco.Web.Routing
{
// redirect to another page
var node = _routingContext.UmbracoContext.ContentCache.GetById(internalRedirectId);
_pcr.SetInternalRedirectPublishedContent(node); // don't use .PublishedContent here
if (node != null)
{
redirect = true;
_pcr.SetInternalRedirectPublishedContent(node); // don't use .PublishedContent here
redirect = true;
ProfilingLogger.Logger.Debug<PublishedContentRequestEngine>("{0}Redirecting to id={1}", () => tracePrefix, () => internalRedirectId);
}
else