From 3bb50652bb5bd0fb9d89e6a7d94cd5f23f606bb8 Mon Sep 17 00:00:00 2001 From: "ajschult%verizon.net" Date: Sat, 20 May 2006 06:43:04 +0000 Subject: [PATCH] Bug 336009: Return early on failure in nsXPInstallManager::ConfirmInstall (coverity 468). Patch by Jon Smirl , r=bsmedberg, sr=dveditz git-svn-id: svn://10.0.0.236/trunk@198071 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpinstall/src/nsXPInstallManager.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp index 4975edbb699..f0843a1998a 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.cpp +++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp @@ -354,13 +354,14 @@ nsXPInstallManager::ConfirmInstall(nsIDOMWindow *aParent, const PRUnichar **aPac ifptr->SetDataIID(&NS_GET_IID(nsIDialogParamBlock)); char* confirmDialogURL; - nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); - if (pref) { - rv = pref->GetCharPref(PREF_XPINSTALL_CONFIRM_DLG, &confirmDialogURL); - NS_ASSERTION(NS_SUCCEEDED(rv), "Can't invoke XPInstall FE without a FE URL! Set xpinstall.dialog.confirm"); - if (NS_FAILED(rv)) - return rv; - } + nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); + if (!pref) + return rv; + + rv = pref->GetCharPref(PREF_XPINSTALL_CONFIRM_DLG, &confirmDialogURL); + NS_ASSERTION(NS_SUCCEEDED(rv), "Can't invoke XPInstall FE without a FE URL! Set xpinstall.dialog.confirm"); + if (NS_FAILED(rv)) + return rv; rv = parentWindow->OpenDialog(NS_ConvertASCIItoUTF16(confirmDialogURL), NS_LITERAL_STRING("_blank"),