From 93eca2c266c70a0ac8cb043f3727403a600e7e02 Mon Sep 17 00:00:00 2001 From: "reed%reedloden.com" Date: Mon, 7 Jan 2008 03:10:09 +0000 Subject: [PATCH] Bug 307310 - "crash [@ nsAbout::NewChannel]" [p=b.jacques@planet.nl (Bastiaan Jacques) r=timeless a1.9=schrep] git-svn-id: svn://10.0.0.236/trunk@242545 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsAbout.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsAbout.cpp b/mozilla/xpfe/appshell/src/nsAbout.cpp index e541c70291d..2746e36263b 100644 --- a/mozilla/xpfe/appshell/src/nsAbout.cpp +++ b/mozilla/xpfe/appshell/src/nsAbout.cpp @@ -54,21 +54,20 @@ nsAbout::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); - if ( NS_FAILED(rv) ) - return rv; + NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr tempChannel; - rv = ioService->NewChannel(NS_LITERAL_CSTRING(kURI), nsnull, nsnull, getter_AddRefs(tempChannel)); + rv = ioService->NewChannel(NS_LITERAL_CSTRING(kURI), nsnull, nsnull, + getter_AddRefs(tempChannel)); + NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr securityManager = do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); - if (NS_FAILED(rv)) - return rv; + NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr principal; rv = securityManager->GetCodebasePrincipal(aURI, getter_AddRefs(principal)); - if (NS_FAILED(rv)) - return rv; + NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr owner = do_QueryInterface(principal); rv = tempChannel->SetOwner(owner);