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

386998 better check for UNC paths

Browse Source 
r=dveditz sr=bz a=dveditz


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@233366 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%gmx.at
2007-08-30 00:46:59 +00:00
parent 15f251dd67
commit 1e2bc8a2d4
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/modules/libpr0n/decoders/icon/nsIconURI.cpp
View File

@@ -286,15 +286,7 @@ nsMozIconURI::SetSpec(const nsACString &aSpec)
rv = ioService->NewURI(mDummyFilePath, nsnull, nsnull, getter_AddRefs(tmpURI));
if (NS_SUCCEEDED(rv) && tmpURI)
{
nsCAutoString filespec;
tmpURI->GetSpec(filespec);
if ( strncmp("file:////", filespec.get(), 9) &&
strncmp("file:///%", filespec.get(), 9) )
{
// accept only local files; disallow UNC paths (bug 376328)
// and attempts to escape them (bug 386998)
mFileIcon = tmpURI;
}
mFileIcon = tmpURI;
}
}
if (!sizeString.IsEmpty())

12
mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
View File

@@ -209,10 +209,8 @@ nsresult nsIconChannel::ExtractIconInfoFromUrl(nsIFile ** aLocalFile, PRUint32 *
nsCOMPtr<nsIFile> file;
rv = fileURL->GetFile(getter_AddRefs(file));
if (NS_FAILED(rv) || !file) return NS_OK;
*aLocalFile = file;
NS_IF_ADDREF(*aLocalFile);
return NS_OK;
return file->Clone(aLocalFile);
}
NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
@@ -289,7 +287,13 @@ nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, PRBool nonBloc
if (localFile)
{
rv = localFile->Normalize();
NS_ENSURE_SUCCESS(rv, rv);
localFile->GetNativePath(filePath);
if (filePath.Length() < 2 || filePath[1] != ':')
return NS_ERROR_MALFORMED_URI; // UNC
localFile->Exists(&fileExists);
}