Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add error message when user tries to load a malformed url instead of silently ignoring it. b=89118 r=ccarlen@netscape.com sr=rpotts@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@108052 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
locka%iol.ie
2001-11-14 13:26:43 +00:00
parent 86581dbcfa
commit 04d0dcd1ae
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -2206,8 +2206,9 @@ nsDocShell::LoadURI(const PRUnichar * aURI, PRUint32 aLoadFlags)
nsXPIDLString messageStr;
NS_ENSURE_SUCCESS(stringBundle->
GetStringFromName(NS_LITERAL_STRING("protocolNotFound").get(),
getter_Copies(messageStr)),
GetStringFromName(
NS_LITERAL_STRING("protocolNotFound").get(),
getter_Copies(messageStr)),
NS_ERROR_FAILURE);
nsAutoString uriString(aURI);
@@ -2225,6 +2226,24 @@ nsDocShell::LoadURI(const PRUnichar * aURI, PRUint32 aLoadFlags)
prompter->Alert(nsnull, msg);
nsTextFormatter::smprintf_free(msg);
} // end unknown protocol
else if (NS_ERROR_MALFORMED_URI == rv) {
// malformed URI
nsCOMPtr<nsIPrompt> prompter;
nsCOMPtr<nsIStringBundle> stringBundle;
GetPromptAndStringBundle(getter_AddRefs(prompter),
getter_AddRefs(stringBundle));
NS_ENSURE_TRUE(stringBundle, NS_ERROR_FAILURE);
nsXPIDLString messageStr;
NS_ENSURE_SUCCESS(stringBundle->
GetStringFromName(
NS_LITERAL_STRING("malformedURI").get(),
getter_Copies(messageStr)),
NS_ERROR_FAILURE);
prompter->Alert(nsnull, messageStr.get());
}
if (!uri)
return NS_ERROR_FAILURE;