| Index: chrome_elf/chrome_elf_main.cc
|
| diff --git a/chrome_elf/chrome_elf_main.cc b/chrome_elf/chrome_elf_main.cc
|
| index 4291430970496b6f13d2aec4113c61ce3c86b286..9ad8299274437b82b3ab4605ca9f9f6ca24fae93 100644
|
| --- a/chrome_elf/chrome_elf_main.cc
|
| +++ b/chrome_elf/chrome_elf_main.cc
|
| @@ -6,15 +6,21 @@
|
|
|
| #include "chrome_elf/chrome_elf_main.h"
|
|
|
| +#include "chrome_elf/blacklist/blacklist.h"
|
| #include "chrome_elf/ntdll_cache.h"
|
|
|
| -void InitChromeElf() {
|
| - // This method is a no-op which may be called to force a load-time dependency
|
| - // on chrome_elf.dll.
|
| +void SignalChromeElf() {
|
| + blacklist::ClearBeacon();
|
| }
|
|
|
| BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
|
| - if (reason == DLL_PROCESS_ATTACH)
|
| + if (reason == DLL_PROCESS_ATTACH) {
|
| InitCache();
|
| + blacklist::Initialize(false); // Don't force, abort if beacon is present.
|
| +
|
| + // TODO(csharp): Move additions to the DLL blacklist to a sane place.
|
| + // blacklist::AddDllToBlacklist(L"foo.dll");
|
| + }
|
| +
|
| return TRUE;
|
| }
|
|
|