Enforce Terminate on Heap Corruption in most of our executable on Windows XP SP3 or Vista.

This won't submit the crash dump but it's still better than nothing.

Fix broken alignment on test_shell_main.cc.
Review URL: http://codereview.chromium.org/3105

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2546 0039d316-1c4b-4281-b951-d872f2087c98

base/process_util.h

@@ -258,6 +258,10 @@ class ProcessMetrics {
 // Note: Returns true on Windows 2000 without doing anything.
 bool EnableLowFragmentationHeap();
 
+// Enable 'terminate on heap corruption' flag. Helps protect against heap
+// overflow. Has no effect if the OS doesn't provide the necessary facility.
+void EnableTerminationOnHeapCorruption();
+
 // If supported on the platform, and the user has sufficent rights, increase
 // the current process's scheduling priority to a high priority.
 void RaiseProcessToHighPriority();

base/process_util_posix.cc

@@ -23,6 +23,10 @@ int GetProcId(ProcessHandle process) {
   return process;
 }
 
+void EnableTerminationOnHeapCorruption() {
+  // On POSIX, there nothing to do AFAIK.
+}
+
 void RaiseProcessToHighPriority() {
   // On POSIX, we don't actually do anything here.  We could try to nice() or
   // setpriority() or sched_getscheduler, but these all require extra rights.

base/process_util_win.cc

@@ -598,6 +598,11 @@ bool EnableLowFragmentationHeap() {
   return true;
 }
 
+void EnableTerminationOnHeapCorruption() {
+  // Ignore the result code. Supported on XP SP3 and Vista.
+  HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
+}
+
 void RaiseProcessToHighPriority() {
   SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
 }

base/run_all_unittests.cc

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/process_util.h"
 #include "base/test_suite.h"
 
 int main(int argc, char** argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   return TestSuite(argc, argv).Run();
 }
-

chrome/app/chrome.exe.deps

@@ -6,6 +6,7 @@ dependents = [
   'ADVAPI32.dll',
   'SHELL32.dll',
   'VERSION.dll',  # Used by breakpad
+  'winmm.dll',
 ]
 
 dependents_google_chrome = [

chrome/app/chrome_exe_main.cc

@@ -9,6 +9,7 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
+#include "base/process_util.h"
 #include "chrome/app/breakpad.h"
 #include "chrome/app/client_util.h"
 #include "chrome/app/google_update_client.h"
@@ -19,6 +20,8 @@
 
 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
                       wchar_t* command_line, int show_command) {
+  process_util::EnableTerminationOnHeapCorruption();
+
   // The exit manager is in charge of calling the dtors of singletons.
   base::AtExitManager exit_manager;
 

chrome/common/ipc_tests.cc

@@ -378,6 +378,7 @@ HANDLE SpawnChild(ChildType child_type) {
 }
 
 int main(int argc, char** argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   // Some tests may use base::Singleton<>, thus we need to instanciate
   // the AtExitManager or else we will leak objects.
   base::AtExitManager at_exit_manager;  

chrome/installer/util/run_all_unittests.cc

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/process_util.h"
 #include "base/test_suite.h"
 
 int main(int argc, char** argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   return TestSuite(argc, argv).Run();
 }
-

chrome/test/perf/perftests.cc

@@ -4,12 +4,14 @@
 
 #include "base/message_loop.h"
 #include "base/perftimer.h"
+#include "base/process_util.h"
 #include "chrome/common/chrome_paths.cc"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(darin): share code with base/run_all_perftests.cc
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   chrome::RegisterPathProvider();
   MessageLoop main_message_loop;
 

chrome/test/reliability/run_all_unittests.cc

@@ -3,9 +3,11 @@
 // found in the LICENSE file.
 
 #include "base/at_exit.h"
+#include "base/process_util.h"
 #include "chrome/test/reliability/reliability_test_suite.h"
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   return ReliabilityTestSuite(argc, argv).Run();
 }
 

chrome/test/ui/run_all_unittests.cc

@@ -4,10 +4,11 @@
 
 #include "base/at_exit.h"
 #include "base/platform_thread.h"
+#include "base/process_util.h"
 #include "chrome/test/ui/ui_test_suite.h"
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   PlatformThread::SetName("Tests_Main");
   return UITestSuite(argc, argv).Run();
 }
-

chrome/test/unit/run_all_unittests.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "build/build_config.h"
+#include "base/process_util.h"
 
 #include "base/test_suite.h"
 
@@ -12,6 +13,7 @@
 #endif
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
 #if defined(OS_WIN)
   // TODO(port): This is not Windows-specific, but needs to be ported.
   return ChromeTestSuite(argc, argv).Run();
@@ -19,4 +21,3 @@ int main(int argc, char **argv) {
   return TestSuite(argc, argv).Run();
 #endif
 }
-

chrome/tools/convert_dict/convert_dict.cc

@@ -14,6 +14,7 @@
 #include <stdio.h>
 
 #include "base/icu_util.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
 #include "chrome/third_party/hunspell/google/bdict_reader.h"
 #include "chrome/third_party/hunspell/google/bdict_writer.h"
@@ -69,6 +70,7 @@ int PrintHelp() {
 }  // namespace
 
 int main(int argc, char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   if (argc != 2)
     return PrintHelp();
 

chrome/tools/perf/flush_cache/flush_cache.cc

@@ -6,10 +6,12 @@
 // It's useful for testing Chrome with a cold database.
 
 #include "base/string_piece.h"
+#include "base/process_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/test/test_file_util.h"
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   if (argc <= 1) {
     fprintf(stderr, "flushes disk cache for files\n");
     fprintf(stderr, "usage: %s <filenames>\n", argv[0]);

chrome/tools/profiles/generate_profile.cc

@@ -11,6 +11,7 @@
 #include "base/icu_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/history/history.h"
@@ -178,6 +179,7 @@ void InsertURLBatch(const std::wstring& profile_dir, int page_id,
 }
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   base::AtExitManager exit_manager;
 
   int next_arg = 1;

chrome/tools/test/image_diff/image_diff.cc

@@ -15,6 +15,7 @@
 #include "base/command_line.h"
 #include "base/gfx/png_decoder.h"
 #include "base/logging.h"
+#include "base/process_util.h"
 #include "base/scoped_ptr.h"
 
 // Causes the app to remain open, waiting for pairs of filenames on stdin.
@@ -228,6 +229,7 @@ int CompareImages(const char* file1, const char* file2) {
 }
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   CommandLine parsed_command_line;
   if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
     // Watch stdin for filenames.

net/tools/tld_cleanup/tld_cleanup.cc

@@ -25,6 +25,7 @@
 #include "base/icu_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_parse.h"
@@ -205,6 +206,7 @@ NormalizeResult NormalizeFile(const std::wstring& in_filename,
 }
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   if (argc != 3) {
     fprintf(stderr, "Normalizes and verifies UTF-8 TLD data files\n");
     fprintf(stderr, "Usage: %s <input> <output>\n", argv[0]);

webkit/tools/test_shell/run_all_tests.cc

@@ -11,6 +11,7 @@
 #include "base/at_exit.h"
 #include "base/icu_util.h"
 #include "base/message_loop.h"
+#include "base/process_util.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_shell_test.h"
@@ -26,6 +27,7 @@ const char* TestShellTest::kJavascriptDelayExitScript =
   "</script>";
 
 int main(int argc, char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   // Some unittests may use base::Singleton<>, thus we need to instanciate
   // the AtExitManager or else we will leak objects.
   base::AtExitManager at_exit_manager;  

webkit/tools/test_shell/test_shell_main.cc

@@ -19,6 +19,7 @@
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/process_util.h"
 #include "base/resource_util.h"
 #include "base/stack_container.h"
 #include "base/stats_table.h"
@@ -111,8 +112,8 @@ bool MinidumpCallback(const wchar_t *dumpPath,
 }
 }  // namespace
 
-int main(int argc, char* argv[])
+int main(int argc, char* argv[]) {
-{
+  process_util::EnableTerminationOnHeapCorruption();
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
   _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
@@ -226,12 +227,14 @@ int main(int argc, char* argv[])
   }
 
   if (parsed_command_line.GetLooseValueCount() > 0) {
-        CommandLine::LooseValueIterator iter = parsed_command_line.GetLooseValuesBegin();
+    CommandLine::LooseValueIterator iter(
+        parsed_command_line.GetLooseValuesBegin());
     uri = *iter;
   }
 
   if (parsed_command_line.HasSwitch(test_shell::kCrashDumps)) {
-        std::wstring dir = parsed_command_line.GetSwitchValue(test_shell::kCrashDumps);
+    std::wstring dir(
+        parsed_command_line.GetSwitchValue(test_shell::kCrashDumps));
     new google_breakpad::ExceptionHandler(dir, 0, &MinidumpCallback, 0, true);
   }
 
@@ -351,5 +354,3 @@ int main(int argc, char* argv[])
 #endif
   return 0;
 }
-
-