summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-25 16:28:56 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-25 16:28:56 +0000
commit689e237ec010792fe78343d9eff48539050481b0 (patch)
treef3013d7212f552291c2c3cbc0fdc95eb4bae8357
parentc8e234f12d0ab9c50a1665c0a9d2fae9b5623f3e (diff)
downloadchromium_src-689e237ec010792fe78343d9eff48539050481b0.zip
chromium_src-689e237ec010792fe78343d9eff48539050481b0.tar.gz
chromium_src-689e237ec010792fe78343d9eff48539050481b0.tar.bz2
Disable the yahoo application state plugin as it crashes the plugin process
on return from NPObjectStub::OnInvoke. This is because of a bug in the plugin, where in it returns a string in the variant which is not allocated using NPN_MemAlloc. As a result it crashes when we free the memory for the string. It also crashes in Firefox. Firefox 3 disables the plugin. (http://kb.mozillazine.org/Issues_related_to_plugins). We disable this plugin as well. This fixes http://b/issue?id=1362948 R=jam Bug=1362948 Review URL: http://codereview.chromium.org/8179 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3979 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/plugins/plugin_list.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index e8e4ea7..02b52ac 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -42,6 +42,7 @@ static const TCHAR kRegistryFirefoxInstalled[] =
static const TCHAR kMozillaActiveXPlugin[] = _T("npmozax.dll");
static const TCHAR kNewWMPPlugin[] = _T("np-mswmp.dll");
static const TCHAR kOldWMPPlugin[] = _T("npdsplay.dll");
+static const TCHAR kYahooApplicationStatePlugin[] = _T("npystate.dll");
static const TCHAR kRegistryJava[] =
_T("Software\\JavaSoft\\Java Runtime Environment");
static const TCHAR kRegistryBrowserJavaVersion[] = _T("BrowserJavaVersion");
@@ -190,6 +191,12 @@ bool PluginList::ShouldLoadPlugin(const std::wstring& filename) {
if (filename == kMozillaActiveXPlugin)
return false;
+ // Disable the yahoo application state plugin as it crashes the plugin
+ // process on return from NPObjectStub::OnInvoke. Please refer to
+ // http://b/issue?id=1372124 for more information.
+ if (filename == kYahooApplicationStatePlugin)
+ return false;
+
// We will use activex shim to handle embeded wmp media.
if (use_internal_activex_shim_) {
if (filename == kNewWMPPlugin || filename == kOldWMPPlugin)