In CrMallocErrorBreak, do not kill the process if errno is ENOMEM.

base/process_util_unittest.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.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
 #if defined(OS_LINUX)
-#include <errno.h>
 #include <malloc.h>
 #include <glib.h>
 #include <sched.h>
 #endif
 #if defined(OS_POSIX)
+#include <errno.h>
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #endif
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 406 matching lines @@
 
 #endif  // defined(OS_WIN)
 
 #if defined(OS_MACOSX)
 
 TEST_F(ProcessUtilTest, MacTerminateOnHeapCorruption) {
   // Note that base::EnableTerminationOnHeapCorruption() is called as part of
   // test suite setup and does not need to be done again, else mach_override
   // will fail.
 
-  char buf[3];
-  ASSERT_DEATH(free(buf), "being freed.*"
+  // Test that ENOMEM doesn't crash.
+  void* buf = malloc(std::numeric_limits<size_t>::max());

[Scott Hess - ex-Googler, 2012/03/06 01:27:51]

Whoa, that's super shiny!

BTW, did you see the comment in EnableTerminationOnOutOfMemory()?  It seems
relevant.

[Robert Sesek, 2012/03/06 01:55:43]

Very, very relevant. That explains the behavior I was seeing. Updated to get the
malloc_error_break() behavior.

+  EXPECT_FALSE(buf);
+  EXPECT_EQ(ENOMEM, errno) << "Expected no memory error";
+
+  char stack_buf[3];
+  ASSERT_DEATH(free(stack_buf), "being freed.*"
       "\\*\\*\\* set a breakpoint in malloc_error_break to debug.*"
       "Terminating process due to a potential for future heap corruption");
 }
 
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_POSIX)
 
 namespace {
 
@@ skipping 681 matching lines @@
       SetUpInDeathAssert();
       while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {}
     }, "");
 }
 
 #endif  // !ARCH_CPU_64_BITS
 #endif  // OS_MACOSX
 
 #endif  // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
         // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER)