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

Fix bug 154346 the right way. r=law, sr=jag

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@124440 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2002-07-01 23:14:07 +00:00
parent 2910b2cdb3
commit 58aef136eb
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
View File

@ -1188,21 +1188,22 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo
* happening if we decide to execute
*/
nsCOMPtr<nsIFile> fileToTest;
rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(fileToTest));
if (NS_SUCCEEDED(rv)) {
rv = fileToTest->Append(mSuggestedFileName);
if (NS_SUCCEEDED(rv)) {
PRBool isExecutable = PR_TRUE;
fileToTest->IsExecutable(&isExecutable);
if (isExecutable) {
action = nsIMIMEInfo::saveToDisk;
}
nsCOMPtr<nsIURI> garbageURI;
PRInt64 garbageTimestamp;
GetDownloadInfo(getter_AddRefs(garbageURI), &garbageTimestamp,
getter_AddRefs(fileToTest));
if (fileToTest) {
PRBool isExecutable;
rv = fileToTest->IsExecutable(&isExecutable);
if ((NS_SUCCEEDED(rv) && isExecutable) ||
NS_FAILED(rv)) { // Paranoia is good
action = nsIMIMEInfo::saveToDisk;
}
}
if (NS_FAILED(rv)) { // Paranoia is good
} else { // Paranoia is good here too, though this really should not happen
NS_WARNING("GetDownloadInfo returned a null file after the temp file has been set up! ");
action = nsIMIMEInfo::saveToDisk;
}
#endif
if ( action == nsIMIMEInfo::saveToDisk )
{