author | John Schoenick <jschoenick@mozilla.com> |
Thu, 06 Mar 2014 17:02:00 -0800 | |
changeset 173208 | a617b3b8813279d5b16c21a2a1ad562a86ee9275 |
parent 173207 | 56ff5e931815c6fd9206f9f998d735fa49b2e4dd |
child 173209 | 549cc0c0672f937c07b3045558861d5bf753843c |
push id | 40953 |
push user | jschoenick@mozilla.com |
push date | Wed, 12 Mar 2014 18:48:16 +0000 |
treeherder | mozilla-inbound@549cc0c0672f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | josh |
bugs | 980625 |
milestone | 30.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/plugins/ipc/PluginModuleChild.cpp +++ b/dom/plugins/ipc/PluginModuleChild.cpp @@ -164,28 +164,31 @@ PluginModuleChild::Init(const std::strin bool exists; localFile->Exists(&exists); NS_ASSERTION(exists, "plugin file ain't there"); nsPluginFile pluginFile(localFile); #if defined(MOZ_X11) || defined(OS_MACOSX) nsPluginInfo info = nsPluginInfo(); - if (NS_FAILED(pluginFile.GetPluginInfo(info, &mLibrary))) + if (NS_FAILED(pluginFile.GetPluginInfo(info, &mLibrary))) { return false; + } #if defined(MOZ_X11) NS_NAMED_LITERAL_CSTRING(flash10Head, "Shockwave Flash 10."); if (StringBeginsWith(nsDependentCString(info.fDescription), flash10Head)) { AddQuirk(QUIRK_FLASH_EXPOSE_COORD_TRANSLATION); } #else // defined(OS_MACOSX) mozilla::plugins::PluginUtilsOSX::SetProcessName(info.fName); #endif + pluginFile.FreePluginInfo(info); + if (!mLibrary) #endif { nsresult rv = pluginFile.LoadPlugin(&mLibrary); if (NS_FAILED(rv)) return false; } NS_ASSERTION(mLibrary, "couldn't open shared object");