corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash if NP_Initialize failed remotely: PluginLibrary::NP_Initialize returns an nsresult, not a NPError; nsNPAPIPlugin::CreatePlugin fails but still sets the outparam; nsPluginHost doesn't properly rv-check nsNPAPIPlugin::CreatePlugin, which causes us to think the bad plugin is actually good. I hate stupid failure chains!

Browse Source
This commit is contained in:
Benjamin Smedberg
2009-11-20 10:34:20 -05:00
parent 4d41aed930
commit ba306d0e83
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dom/plugins/PluginModuleParent.cpp
View File

@@ -446,7 +446,7 @@ PluginModuleParent::NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs
mNPNIface = bFuncs;
if (!CallNP_Initialize(error)) {
return NPERR_GENERIC_ERROR;
return NS_ERROR_FAILURE;
}
else if (*error != NPERR_NO_ERROR) {
return NS_OK;
@@ -464,7 +464,7 @@ PluginModuleParent::NP_Initialize(NPNetscapeFuncs* bFuncs, NPError* error)
mNPNIface = bFuncs;
if (!CallNP_Initialize(error))
return NPERR_GENERIC_ERROR;
return NS_ERROR_FAILURE;
return NS_OK;
}