Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: content/common/plugin_list_win.cc

Issue 327983002: Do not attempt to load 32-bit NPAPI plugins on 64-bit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/plugin_list_win.cc
diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc
index dfc17114d20ff6d3293858ed13e0d2999daee099..e7d4b4b904bf5255f0eebfd9ac020f76702340ac 100644
--- a/content/common/plugin_list_win.cc
+++ b/content/common/plugin_list_win.cc
@@ -463,9 +463,13 @@ bool PluginList::ShouldLoadPluginUsingPluginList(
}
}
-#if !defined(ARCH_CPU_X86_64)
- // The plugin in question could be a 64 bit plugin which we cannot load.
base::FilePath plugin_path(info.path);
+#if defined(ARCH_CPU_X86_64)
+ // The plugin in question could be a 32 bit plugin which we cannot load.
+ if (IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path)))
+ return false;
+#else
+ // The plugin in question could be a 64 bit plugin which we cannot load.
if (!IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path)))
return false;
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698