Bug 336009: Return early on failure in nsXPInstallManager::ConfirmInstall (coverity 468). Patch by Jon Smirl <jonsmirl@yahoo.com>, r=bsmedberg, sr=dveditz
git-svn-id: svn://10.0.0.236/trunk@198071 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
8180143d7c
commit
3bb50652bb
@ -354,13 +354,14 @@ nsXPInstallManager::ConfirmInstall(nsIDOMWindow *aParent, const PRUnichar **aPac
|
||||
ifptr->SetDataIID(&NS_GET_IID(nsIDialogParamBlock));
|
||||
|
||||
char* confirmDialogURL;
|
||||
nsCOMPtr<nsIPrefBranch> 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<nsIPrefBranch> 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"),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user