Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix case where FillContentHandlerProperties incorrectly returns NS_ERROR_FAILURE (bug 389446), r+sr=bzbarsky

Browse Source
This commit is contained in:
dmose@mozilla.org 2007-07-25 19:56:46 -07:00
parent aa72e9323e
commit 11778c0af9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
uriloader/exthandler/nsExternalHelperAppService.cpp
View File

@ -865,11 +865,11 @@ nsresult nsExternalHelperAppService::FillContentHandlerProperties(
return NS_ERROR_OUT_OF_MEMORY;
}
rv = aHandlerInfo->SetPreferredApplicationHandler(handlerApp);
return aHandlerInfo->SetPreferredApplicationHandler(handlerApp);
}
} else {
// if we got here, there's no path name in the RDF graph, so this must
// be a web app
// maybe we've get a uri template, which would indicate that this is a
// web-handler
FillLiteralValueFromTarget(externalAppNodeResource, kNC_UriTemplate,
&stringValue);
if (stringValue && stringValue[0]) {
@ -879,14 +879,13 @@ nsresult nsExternalHelperAppService::FillContentHandlerProperties(
if (!handlerApp) {
return NS_ERROR_OUT_OF_MEMORY;
}
rv = aHandlerInfo->SetPreferredApplicationHandler(handlerApp);
} else {
return NS_ERROR_FAILURE; // no path name _and_ no uri template
return aHandlerInfo->SetPreferredApplicationHandler(handlerApp);
}
// otherwise, no handler at all; fall through to return NS_OK
}
}
return rv;
return NS_OK;
}
#endif /* MOZ_RDF */