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

Bug 1141081: Ensure nsPluginInstanceOwner::Destroy is called before returning from failed plugin instantiation; r=jimm

Browse Source
This commit is contained in:
Aaron Klotz
2015-03-17 19:44:34 -06:00
parent c06c091500
commit 0cc33f8eda
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dom/plugins/base/nsPluginHost.cpp
View File

@@ -811,17 +811,20 @@ nsPluginHost::InstantiatePluginInstance(const nsACString& aMimeType, nsIURI* aUR
nsPluginTagType tagType; nsPluginTagType tagType;
rv = instanceOwner->GetTagType(&tagType); rv = instanceOwner->GetTagType(&tagType);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
instanceOwner->Destroy();
return rv; return rv;
} }
if (tagType != nsPluginTagType_Embed && if (tagType != nsPluginTagType_Embed &&
tagType != nsPluginTagType_Applet && tagType != nsPluginTagType_Applet &&
tagType != nsPluginTagType_Object) { tagType != nsPluginTagType_Object) {
instanceOwner->Destroy();
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
rv = SetUpPluginInstance(aMimeType, aURL, instanceOwner); rv = SetUpPluginInstance(aMimeType, aURL, instanceOwner);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
instanceOwner->Destroy();
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
const bool isAsyncInit = (rv == NS_PLUGIN_INIT_PENDING); const bool isAsyncInit = (rv == NS_PLUGIN_INIT_PENDING);
@@ -829,6 +832,7 @@ nsPluginHost::InstantiatePluginInstance(const nsACString& aMimeType, nsIURI* aUR
nsRefPtr<nsNPAPIPluginInstance> instance; nsRefPtr<nsNPAPIPluginInstance> instance;
rv = instanceOwner->GetInstance(getter_AddRefs(instance)); rv = instanceOwner->GetInstance(getter_AddRefs(instance));
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
instanceOwner->Destroy();
return rv; return rv;
} }