| Index: chrome/installer/mini_installer/mini_installer.cc
|
| diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc
|
| index 7ca6e9f122a78f44c34582afcd6ec7b7117f8c7b..be29092fd8adaf66086f878babd33898b74a3655 100644
|
| --- a/chrome/installer/mini_installer/mini_installer.cc
|
| +++ b/chrome/installer/mini_installer/mini_installer.cc
|
| @@ -15,7 +15,7 @@
|
| // BufferSecurityCheck="false" compiler: /GS-
|
| // EntryPointSymbol="MainEntryPoint" linker: /ENTRY
|
| // IgnoreAllDefaultLibraries="true" linker: /NODEFAULTLIB
|
| -// OptimizeForWindows98="1" liker: /OPT:NOWIN98
|
| +// OptimizeForWindows98="1" linker: /OPT:NOWIN98
|
| // linker: /SAFESEH:NO
|
|
|
| // have the linker merge the sections, saving us ~500 bytes.
|
| @@ -895,6 +895,19 @@ int MainEntryPoint() {
|
| ::ExitProcess(result.exit_code);
|
| }
|
|
|
| +#if defined(ADDRESS_SANITIZER)
|
| +// Executables instrumented with ASAN need CRT functions. We do not use
|
| +// the /ENTRY switch for ASAN instrumented executable and a "main" function
|
| +// is required.
|
| +int WINAPI WinMain(HINSTANCE hInstance,
|
| + HINSTANCE hPrevInstance,
|
| + LPSTR lpCmdLine,
|
| + int nCmdShow) {
|
| + MainEntryPoint();
|
| + return 0;
|
| +}
|
| +#endif
|
| +
|
| // VC Express editions don't come with the memset CRT obj file and linking to
|
| // the obj files between versions becomes a bit problematic. Therefore,
|
| // simply implement memset.
|
|
|