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

bug 110081, patch=adamlock, r=pchen, sr=ben, harden docshell against empty URLs

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@108433 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pchen%netscape.com
2001-11-18 07:45:14 +00:00
parent 83fe182deb
commit 26d858b7f6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2246,7 +2246,7 @@ nsDocShell::LoadURI(const PRUnichar * aURI, PRUint32 aLoadFlags)
prompter->Alert(nsnull, messageStr.get());
}
if (!uri)
if (NS_FAILED(rv) || !uri)
return NS_ERROR_FAILURE;
NS_ENSURE_SUCCESS(LoadURI(uri, nsnull, aLoadFlags), NS_ERROR_FAILURE);
@@ -4082,11 +4082,13 @@ nsDocShell::CreateFixupURI(const PRUnichar * aStringURI, nsIURI ** aURI)
{
*aURI = nsnull;
nsAutoString uriString(aStringURI);
uriString.Trim(" "); // Cleanup the empty spaces that might be on each end.
uriString.CompressWhitespace(); // Cleanup the empty spaces that might be on each end.
// Eliminate embedded newlines, which single-line text fields now allow:
uriString.StripChars("\r\n");
NS_ENSURE_TRUE(uriString.Length() > 0, NS_ERROR_FAILURE);
// Create the fixup object if necessary
if (!mURIFixup) {
mURIFixup = do_GetService(NS_URIFIXUP_CONTRACTID);