116427 - MLKs in nsPluginHostImpl.cpp

Status: VERIFIED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Navin Gupta]

[W] MLK: Memory leak of 491 bytes from 18 blocks allocated in PL_strdup
        Distribution of leaked blocks
        Allocation location
            malloc         [dbgheap.c:129]
            PL_strdup      [strdup.c:46]
            nsCRT::strdup(char const*) [nsCRT.h:182]
            nsRegistry::GetBytesUTF8(UINT,char const*,UINT *,BYTE * *) 
[nsRegistry.cpp:859]
                            if ( err == REGERR_OK )
                            {
                                *length = length2;
             =>                 *result = (PRUint8*)(nsCRT::strdup(regStr));
                                if (!*result)
                                {
                                    rv = NS_ERROR_OUT_OF_MEMORY;
            LoadXPCOMPlugin [nsPluginHostImpl.cpp:4789]
                  aRegistry->GetBytesUTF8(aPluginKey, kPluginsNameKey, &length, 
&name);
                
                  PRUint8 * description=nsnull;
             =>   aRegistry->GetBytesUTF8(aPluginKey, kPluginsDescKey, &length, 
&description);
                
                  nsXPIDLCString filename;
                  nsXPIDLCString fullpath;
            nsPluginHostImpl::LoadCachedPluginsInfo(nsIRegistry *) 
[nsPluginHostImpl.cpp:5107]
                    // in to the mCachedPlugins list.
                    nsRegistryKey key;
                    node->GetKey(&key);
             => 
                    nsPluginTag* tag = nsnull;
                    rv = LoadXPCOMPlugin(registry, nsnull, key, &tag);
                    if (NS_FAILED(rv))
            nsPluginHostImpl::LoadPlugins(void) [nsPluginHostImpl.cpp:4635]
                  }
                
                  // Load cached plugins info
             =>   LoadCachedPluginsInfo(registry);
                
                  // retrieve a path for layout module. Needed for plugin mime 
types registration
                  nsCOMPtr<nsIFile> layoutPath;
            nsPluginHostImpl::GetPluginFactory(char const*,nsIPlugin * *) 
[nsPluginHostImpl.cpp:4275]
                  CleanUnusedLibraries();
                
                  // If plugins haven't been scanned yet, do so now
             =>   LoadPlugins();
                
                  nsPluginTag* pluginTag;
                  if((rv = FindPluginEnabledForType(aMimeType, pluginTag)) == 
NS_OK)
            nsJVMManager::StartupJVM(void) [nsJVMManager.cpp:665]
            nsJVMManager::MaybeStartupLiveConnect(void) [nsJVMManager.cpp:901]

Comment 1

[Navin Gupta]

another stack in the same code...

    [W] MLK: Memory leak of 508 bytes from 19 blocks allocated in PL_strdup
        Distribution of leaked blocks
        Allocation location
        malloc         [dbgheap.c:129]
        PL_strdup      [strdup.c:46]
        nsCRT::strdup(char const*) [nsCRT.h:182]
        nsRegistry::GetBytesUTF8(UINT,char const*,UINT *,BYTE * *) 
[nsRegistry.cpp:859]
                    if ( err == REGERR_OK )
                    {
                        *length = length2;
     =>                 *result = (PRUint8*)(nsCRT::strdup(regStr));
                        if (!*result)
                        {
                            rv = NS_ERROR_OUT_OF_MEMORY;
        LoadXPCOMPlugin [nsPluginHostImpl.cpp:4786]
          // in the registry. Pull these out now.
          PRUint8 * name;
          PRUint32 length;
     =>   aRegistry->GetBytesUTF8(aPluginKey, kPluginsNameKey, &length, &name);
                    
                      PRUint8 * description;
                      aRegistry->GetBytesUTF8(aPluginKey, kPluginsDescKey, 
&length, &description);
                nsPluginHostImpl::LoadCachedPluginsInfo(nsIRegistry *) 
[nsPluginHostImpl.cpp:5107]
                        node->GetKey(&key);
                    
                        nsPluginTag* tag = nsnull;
                 =>     rv = LoadXPCOMPlugin(registry, nsnull, key, &tag);
                        if (NS_FAILED(rv))
                          continue;
                    
                nsPluginHostImpl::LoadPlugins(void) [nsPluginHostImpl.cpp:4635]
                      }
                    
                      // Load cached plugins info
                 =>   LoadCachedPluginsInfo(registry);
                    
                      // retrieve a path for layout module. Needed for plugin 
mime types registration
                      nsCOMPtr<nsIFile> layoutPath;
                nsPluginHostImpl::GetPluginFactory(char const*,nsIPlugin * *) 
[nsPluginHostImpl.cpp:4275]
                      CleanUnusedLibraries();
                    
                      // If plugins haven't been scanned yet, do so now
                 =>   LoadPlugins();
                    
                      nsPluginTag* pluginTag;
                      if((rv = FindPluginEnabledForType(aMimeType, pluginTag)) 
== NS_OK)
                nsJVMManager::StartupJVM(void) [nsJVMManager.cpp:665]
                        nsCOMPtr<nsIPlugin> f =
                                 
do_GetService(NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE, &err);
                        if (NS_FAILED(err) || !f) {
                 =>         err = pluginHost->GetPluginFactory(NS_JVM_MIME_TYPE, 
&pluginFactory);
                        }
                        else {
                            pluginFactory  = f;
                nsJVMManager::MaybeStartupLiveConnect(void) 
[nsJVMManager.cpp:901]

Comment 2

[Navin Gupta]

I have a fix in my tree, will attach it. 

Comment 3

[Navin Gupta]

Attachment: proposed fix

The fix is to free name and description.

Comment 4

[Navin Gupta]

cc peterl, av for review

Comment 5

[Navin Gupta]

cc beard for review

Comment 6

[av (gone)]

Comment on attachment 62569 [details] [diff] [review]
proposed fix

Good catch. r=av.

Comment 7

[Scott MacGregor]

Comment on attachment 62569 [details] [diff] [review]
proposed fix

sr=mscott

Comment 8

[Navin Gupta]

fixed

Comment 9

[shrirang khanzode]

.