diff options
| -rw-r--r-- | webkit/glue/plugins/plugin_list.cc | 7 |
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) |