Linux: reenable malloc overrides.

base/process_util_unittest.cc

 // Copyright (c) 2009 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/multiprocess_test.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_LINUX)
 #include <dlfcn.h>
 #include <errno.h>
 #include <malloc.h>
+#include <glib.h>
 #endif
 #if defined(OS_POSIX)
 #include <fcntl.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 #endif
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 349 matching lines @@
       "0 0 0 0 "  // <- No CPU, apparently.
       "16 0 1 0 1676099790 2957312 114 4294967295 134512640 134528148 "
       "3221224832 3221224344 3086339742 0 0 0 0 0 0 0 17 0 0 0";
 
   EXPECT_EQ(0, ParseProcStatCPU(kSelfStat));
 }
 #endif
 
 #endif  // defined(OS_POSIX)
 
-#if 0
-
-// See comments in process_util_linux.cc about why these are removed for now.
-
 // TODO(vandebo) make this work on Windows and Mac too.
 #if defined(OS_LINUX)
 
 #if defined(LINUX_USE_TCMALLOC)
 extern "C" {
 int tc_set_new_mode(int mode);
 }
 #endif  // defined(LINUX_USE_TCMALLOC)
 
 class OutOfMemoryTest : public testing::Test {
@@ skipping 43 matching lines @@
 }
 
 TEST_F(OutOfMemoryTest, Pvalloc) {
   ASSERT_DEATH(value_ = pvalloc(test_size_), "");
 }
 
 TEST_F(OutOfMemoryTest, Memalign) {
   ASSERT_DEATH(value_ = memalign(4, test_size_), "");
 }
 
+TEST_F(OutOfMemoryTest, ViaSharedLibraries) {
+  // g_try_malloc is documented to return NULL on failure. (g_malloc is the
+  // 'safe' default that crashes if allocation fails). However, since we have
+  // hopefully overridden malloc, even g_try_malloc should fail. This tests
+  // that the run-time symbol resolution is overriding malloc for shared
+  // libraries as well as for our code.
+  ASSERT_DEATH(value_ = g_try_malloc(test_size_), "");
+}
+
+
 TEST_F(OutOfMemoryTest, Posix_memalign) {
   // Grab the return value of posix_memalign to silence a compiler warning
   // about unused return values. We don't actually care about the return
   // value, since we're asserting death.
   ASSERT_DEATH(EXPECT_EQ(ENOMEM, posix_memalign(&value_, 8, test_size_)), "");
 }
 
-extern "C" {
-
-void* __libc_malloc(size_t size);
-void* __libc_realloc(void* ptr, size_t size);
-void* __libc_calloc(size_t nmemb, size_t size);
-void* __libc_valloc(size_t size);
-void* __libc_pvalloc(size_t size);
-void* __libc_memalign(size_t alignment, size_t size);
-
-}  // extern "C"
-
-TEST_F(OutOfMemoryTest, __libc_malloc) {
-  ASSERT_DEATH(value_ = __libc_malloc(test_size_), "");
-}
-
-TEST_F(OutOfMemoryTest, __libc_realloc) {
-  ASSERT_DEATH(value_ = __libc_realloc(NULL, test_size_), "");
-}
-
-TEST_F(OutOfMemoryTest, __libc_calloc) {
-  ASSERT_DEATH(value_ = __libc_calloc(1024, test_size_ / 1024L), "");
-}
-
-TEST_F(OutOfMemoryTest, __libc_valloc) {
-  ASSERT_DEATH(value_ = __libc_valloc(test_size_), "");
-}
-
-TEST_F(OutOfMemoryTest, __libc_pvalloc) {
-  ASSERT_DEATH(value_ = __libc_pvalloc(test_size_), "");
-}
-
-TEST_F(OutOfMemoryTest, __libc_memalign) {
-  ASSERT_DEATH(value_ = __libc_memalign(4, test_size_), "");
-}
-
 #endif  // defined(OS_LINUX)
 
-#endif
-
 }  // namespace base