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

Switch to nsCOMPtr to fix possible leaks and a possible strict aliasing

Browse Source 
violation.  Bug 240710, r+sr=roc


git-svn-id: svn://10.0.0.236/trunk@155048 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2004-04-17 23:23:19 +00:00
parent a48a10ef0f
commit 98273f7667
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -3883,8 +3883,8 @@ nsresult nsPluginHostImpl::SetUpDefaultPluginInstance(const char *aMimeType, nsI
nsIPluginInstanceOwner *aOwner)
{
nsresult result = NS_ERROR_FAILURE;
nsIPluginInstance* instance = NULL;
nsCOMPtr<nsIPlugin> plugin = NULL;
nsCOMPtr<nsIPluginInstance> instance;
nsCOMPtr<nsIPlugin> plugin;
if(!aURL)
return NS_ERROR_FAILURE;
@@ -3895,14 +3895,15 @@ nsresult nsPluginHostImpl::SetUpDefaultPluginInstance(const char *aMimeType, nsI
GetPluginFactory("*", getter_AddRefs(plugin));
result = CallCreateInstance(NS_INLINE_PLUGIN_CONTRACTID_PREFIX "*",
&instance);
instance = do_CreateInstance(NS_INLINE_PLUGIN_CONTRACTID_PREFIX "*",
&result);
// couldn't create an XPCOM plugin, try to create wrapper for a legacy plugin
if (NS_FAILED(result))
{
if(plugin)
result = plugin->CreateInstance(NULL, kIPluginInstanceIID, (void **)&instance);
result = plugin->CreateInstance(NULL, kIPluginInstanceIID,
getter_AddRefs(instance));
}
// neither an XPCOM or legacy plugin could be instantiated, so return the failure
@@ -3948,9 +3949,6 @@ nsresult nsPluginHostImpl::SetUpDefaultPluginInstance(const char *aMimeType, nsI
// instance and peer will be addreffed here
result = AddInstanceToActiveList(plugin, instance, aURL, PR_TRUE, pIpeer);
//release what was addreffed in Create(Plugin)Instance
NS_RELEASE(instance);
return result;
}