mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
checkin fix for bug 115128 for sfraser (assertion removed) (r=brade, sr=darin)
This commit is contained in:
parent
3208b25cdd
commit
21e3fd26e3
@ -1853,21 +1853,22 @@ NS_IMETHODIMP nsExternalHelperAppService::GetTypeFromURI(nsIURI *aURI, char **aC
|
||||
#ifdef XP_MAC
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
nsCAutoString fileExt;
|
||||
url->GetFileExtension(fileExt);
|
||||
|
||||
nsresult rv2;
|
||||
nsCOMPtr<nsIFileURL> fileurl = do_QueryInterface( url, &rv2 );
|
||||
if ( NS_SUCCEEDED ( rv2 ) )
|
||||
{
|
||||
nsCOMPtr <nsIFile> file;
|
||||
rv2 = fileurl->GetFile( getter_AddRefs( file ) );
|
||||
if ( NS_SUCCEEDED( rv2 ) )
|
||||
{
|
||||
rv2 = GetTypeFromFile( file, aContentType );
|
||||
if( NS_SUCCEEDED ( rv2 ) )
|
||||
return rv2;
|
||||
}
|
||||
PRBool isFileScheme = PR_FALSE;
|
||||
if (NS_SUCCEEDED(fileurl->SchemeIs("file", &isFileScheme)) && isFileScheme)
|
||||
{
|
||||
nsCOMPtr <nsIFile> file;
|
||||
rv2 = fileurl->GetFile(getter_AddRefs(file));
|
||||
if (NS_SUCCEEDED(rv2))
|
||||
{
|
||||
rv2 = GetTypeFromFile(file, aContentType);
|
||||
if (NS_SUCCEEDED(rv2))
|
||||
return rv2;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user