From d4843470dfa72ae0d1b31be973a55f2074ab5592 Mon Sep 17 00:00:00 2001 From: Christoph Kerschbaumer Date: Thu, 19 Nov 2015 14:22:57 -0800 Subject: [PATCH] Bug 1226324 - Do not use NS_ENSURCE_SUCCESS(rv, NS_OK) within nsContentSecurityManager. r=tanvi --- dom/security/nsContentSecurityManager.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index 9f619bf7b52b..d656f645fe74 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -421,7 +421,9 @@ nsContentSecurityManager::IsURIPotentiallyTrustworthy(nsIURI* aURI, bool* aIsTru *aIsTrustWorthy = false; nsAutoCString scheme; nsresult rv = aURI->GetScheme(scheme); - NS_ENSURE_SUCCESS(rv, NS_OK); + if (NS_FAILED(rv)) { + return NS_OK; + } if (scheme.EqualsLiteral("https") || scheme.EqualsLiteral("file") || @@ -433,7 +435,9 @@ nsContentSecurityManager::IsURIPotentiallyTrustworthy(nsIURI* aURI, bool* aIsTru nsAutoCString host; rv = aURI->GetHost(host); - NS_ENSURE_SUCCESS(rv, NS_OK); + if (NS_FAILED(rv)) { + return NS_OK; + } if (host.Equals("127.0.0.1") || host.Equals("localhost") || @@ -441,6 +445,5 @@ nsContentSecurityManager::IsURIPotentiallyTrustworthy(nsIURI* aURI, bool* aIsTru *aIsTrustWorthy = true; return NS_OK; } - return NS_OK; }