From d251a79517aab4e989344b76d2fb7528107b8793 Mon Sep 17 00:00:00 2001 From: "valeski%netscape.com" Date: Tue, 29 Feb 2000 20:36:52 +0000 Subject: [PATCH] 26336. a=jar, r=norris,pollman. We now allow uri creation failure to pass through to the webshell so we can throw error dialogs if need be. This allows 'https not supported' dialogs to be thrown from form submissions when https isn't installed git-svn-id: svn://10.0.0.236/trunk@61885 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/forms/src/nsFormFrame.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mozilla/layout/html/forms/src/nsFormFrame.cpp b/mozilla/layout/html/forms/src/nsFormFrame.cpp index 8ec82c46fb3..7baf5ba118c 100644 --- a/mozilla/layout/html/forms/src/nsFormFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormFrame.cpp @@ -742,16 +742,16 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame) NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, NS_SCRIPTSECURITYMANAGER_PROGID, &result); nsCOMPtr actionURL; - if (NS_FAILED(result) || - NS_FAILED(result = NS_NewURI(getter_AddRefs(actionURL), href, docURL)) || - NS_FAILED(result = securityManager->CheckLoadURI(docURL, actionURL, - PR_FALSE))) - { - return result; + if (NS_FAILED(result)) return result; + + result = NS_NewURI(getter_AddRefs(actionURL), href, docURL); + if (NS_SUCCEEDED(result)) { + result = securityManager->CheckLoadURI(docURL, actionURL, PR_FALSE); + if (NS_FAILED(result)) return result; } nsXPIDLCString scheme; - if (NS_FAILED(result = actionURL->GetScheme(getter_Copies(scheme)))) + if (actionURL && NS_FAILED(result = actionURL->GetScheme(getter_Copies(scheme)))) return result; if (nsCRT::strcmp(scheme, "mailto") == 0) { PRBool enabled;