Skip to content

Commit

Permalink
Link chrome_elf.dll instead of statically linking the blacklist code
Browse files Browse the repository at this point in the history
This ensure that the dll code is referenced, instead of the target
making its own copy.


BUG=329023

Review URL: https://codereview.chromium.org/176873012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253366 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
csharp@chromium.org committed Feb 26, 2014
1 parent 20d51bb commit 9e57a03
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion chrome/chrome_browser.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -3389,7 +3389,7 @@
'chrome_process_finder',
'installer_util_strings',
'../chrome/chrome.gyp:chrome_version_header',
'../chrome_elf/chrome_elf.gyp:blacklist',
'../chrome_elf/chrome_elf.gyp:chrome_elf',
'../google_update/google_update.gyp:google_update',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/isimpledom/isimpledom.gyp:isimpledom',
Expand Down
7 changes: 1 addition & 6 deletions chrome/renderer/chrome_content_renderer_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,7 @@ void ChromeContentRendererClient::RenderThreadStarted() {
// Report if the renderer process has been patched by chrome_elf.
// TODO(csharp): Remove once the renderer is no longer getting
// patched this way.
typedef bool(*IsBlacklistInitializedFunc)();
IsBlacklistInitializedFunc is_blacklist_initialized =
reinterpret_cast<IsBlacklistInitializedFunc>(
GetProcAddress(GetModuleHandle(L"chrome_elf.dll"),
"IsBlacklistInitialized"));
if (is_blacklist_initialized && is_blacklist_initialized())
if (blacklist::IsBlacklistInitialized())
UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true);
#endif
}
Expand Down
3 changes: 3 additions & 0 deletions chrome_elf/chrome_elf.def
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ EXPORTS
CreateFileW=CreateFileWRedirect
GetRedirectCount
IsBlacklistInitialized
kRegistryBeaconPath
kBeaconVersion
kBeaconState
SignalChromeElf

0 comments on commit 9e57a03

Please sign in to comment.