summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 05:15:23 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 05:15:23 +0000
commitad72907d4cb50d9f67ff12ca006c8e7b643679b6 (patch)
tree7049b80fa529b7edc3b176c127970996b89bfb19
parent513dc2d97a1ddd7118ce6f619ef12f60dcc84049 (diff)
downloadchromium_src-ad72907d4cb50d9f67ff12ca006c8e7b643679b6.zip
chromium_src-ad72907d4cb50d9f67ff12ca006c8e7b643679b6.tar.gz
chromium_src-ad72907d4cb50d9f67ff12ca006c8e7b643679b6.tar.bz2
Stop chrome_elf from patching already patched functions
BUG=353978 Review URL: https://codereview.chromium.org/208273006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259157 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome_elf/blacklist/blacklist.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc
index 19c7641..705cc60 100644
--- a/chrome_elf/blacklist/blacklist.cc
+++ b/chrome_elf/blacklist/blacklist.cc
@@ -244,8 +244,9 @@ bool Initialize(bool force) {
if (!force && !LeaveSetupBeacon())
return false;
- // Tells the resolver to patch already patched functions.
- const bool kRelaxed = true;
+ // It is possible for other dlls to have already patched code by now and
+ // attempting to patch their code might result in crashes.
+ const bool kRelaxed = false;
// Create a thunk via the appropriate ServiceResolver instance.
sandbox::ServiceResolverThunk* thunk = GetThunk(kRelaxed);