From 605cc59292c8d2cefecec19731a4dfddf034683b Mon Sep 17 00:00:00 2001 From: "darin%netscape.com" Date: Thu, 22 Nov 2001 00:19:47 +0000 Subject: [PATCH] fixes bug 111072 "nsIOService::ExtractUrlPart does not return correct HOST (flag=IOService.url_Host)" r=cmanske,andreas.otte, sr=mscott git-svn-id: svn://10.0.0.236/trunk@108766 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/base/src/nsIOService.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp index 74888eb46b1..c348466a5b9 100644 --- a/mozilla/netwerk/base/src/nsIOService.cpp +++ b/mozilla/netwerk/base/src/nsIOService.cpp @@ -540,6 +540,9 @@ nsIOService::ExtractUrlPart(const char *urlString, PRInt16 flag, PRUint32 *start nsresult rv; nsXPIDLCString scheme; + if (urlPart) + *urlPart = nsnull; + ExtractScheme(urlString, startPos, endPos, getter_Copies(scheme)); if (flag == url_Scheme) { @@ -569,6 +572,9 @@ nsIOService::ExtractUrlPart(const char *urlString, PRInt16 flag, PRUint32 *start PRInt32 usernameLen, passwordLen, hostnameLen; PRInt32 port; + if (authLen < 0) + return NS_OK; + rv = parser->ParseAuthority(urlString + authPos, authLen, &usernamePos, &usernameLen, &passwordPos, &passwordLen, @@ -617,6 +623,9 @@ nsIOService::ExtractUrlPart(const char *urlString, PRInt16 flag, PRUint32 *start PRUint32 filepathPos, paramPos, queryPos, refPos; PRInt32 filepathLen, paramLen, queryLen, refLen; + if (pathLen < 0) + return NS_OK; + rv = parser->ParsePath(urlString + pathPos, pathLen, &filepathPos, &filepathLen, ¶mPos, ¶mLen,