Instrument setup.exe in the SyzyAsan builds.

chrome/installer/setup/setup_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/setup/setup_main.h"
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/debug/asan_invalid_access.h"

[grt (UTC plus 2), 2017/03/10 07:57:36]

nit: put this in a #if defined(SYZYASAN) block after line 85

[Sébastien Marchand, 2017/04/05 21:07:02]

Done.

 #include "base/file_version_info.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/process/memory.h"
@@ skipping 1006 matching lines @@
                                    installer::REENABLE_UPDATES_FAILED;
   } else if (cmd_line.HasSwitch(
                  installer::switches::kSetDisplayVersionProduct)) {
     const base::string16 registry_product(
         cmd_line.GetSwitchValueNative(
             installer::switches::kSetDisplayVersionProduct));
     const base::string16 registry_value(
         cmd_line.GetSwitchValueNative(
             installer::switches::kSetDisplayVersionValue));
     *exit_code = OverwriteDisplayVersions(registry_product, registry_value);
+#if defined(SYZYASAN)
+  } else if (cmd_line.HasSwitch(installer::switches::kInduceAsanCrash)) {
+    std::string crash_type =
+        cmd_line.GetSwitchValueASCII(installer::switches::kInduceAsanCrash);
+    if (crash_type == installer::switches::kAsanUseAfterFree) {
+      base::debug::AsanHeapUseAfterFree();
+    } else if (crash_type == installer::switches::kAsanHeapOverflow) {
+      base::debug::AsanHeapOverflow();
+    } else if (crash_type == installer::switches::kAsanHeapUnderflow) {
+      base::debug::AsanHeapUnderflow();
+    } else {
+      LOG(ERROR) << "Invalid Asan error type: " << crash_type;
+      handled = false;
+    }
+#endif
   } else {
     handled = false;
   }
 
   return handled;
 }
 
+#if defined(SYZYASAN)
+// Initialize the SyzyAsan crash reporter. This should only be called once the
+// crash reporter has been initialized. There should be only one call to this
+// function.
+void SetupSyzyAsan() {
+  typedef VOID(WINAPI * SyzyAsanInitializeCrashReporterFn)();

[grt (UTC plus 2), 2017/03/10 07:57:36]

nit: prefer "using" over "typedef"

[Sébastien Marchand, 2017/04/05 21:07:02]

Done.

+  HMODULE syzyasan_handle = ::GetModuleHandle(L"syzyasan_rtl.dll");
+  if (!syzyasan_handle)
+    return;
+
+  SyzyAsanInitializeCrashReporterFn syzyasan_init_crash_reporter =
+      reinterpret_cast<SyzyAsanInitializeCrashReporterFn>(
+          ::GetProcAddress(syzyasan_handle, "asan_InitializeCrashReporter"));
+  if (syzyasan_init_crash_reporter) {

[grt (UTC plus 2), 2017/03/10 07:57:36]

nit: omit braces for one-liner

[Sébastien Marchand, 2017/04/05 21:07:02]

Done.

+    syzyasan_init_crash_reporter();
+  }
+}
+#endif
+
 }  // namespace
 
 namespace installer {
 
 InstallStatus InstallProductsHelper(const InstallationState& original_state,
                                     const base::FilePath& setup_exe,
                                     const base::CommandLine& cmd_line,
                                     const MasterPreferences& prefs,
                                     const InstallerState& installer_state,
                                     base::FilePath* installer_directory,
@@ skipping 295 matching lines @@
           << installer_state.is_migrating_to_single();
 
   persistent_histogram_storage.set_storage_dir(
       installer::PersistentHistogramStorage::GetReportedStorageDir(
           installer_state.target_path()));
 
   installer::ConfigureCrashReporting(installer_state);
   installer::SetInitialCrashKeys(installer_state);
   installer::SetCrashKeysFromCommandLine(cmd_line);
 
+#if defined(SYZYASAN)
+  SetupSyzyAsan();
+#endif
+
   // Make sure the process exits cleanly on unexpected errors.
   base::EnableTerminationOnHeapCorruption();
   base::EnableTerminationOnOutOfMemory();
   base::win::RegisterInvalidParamHandler();
   base::win::SetupCRT(cmd_line);
 
   const bool is_uninstall = cmd_line.HasSwitch(installer::switches::kUninstall);
 
   // Check to make sure current system is Win7 or later. If not, log
   // error message and get out.
@@ skipping 123 matching lines @@
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
   }
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }