summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/process_util_linux.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc
index 1a7e090..8d48824 100644
--- a/base/process_util_linux.cc
+++ b/base/process_util_linux.cc
@@ -513,6 +513,12 @@ void OnNoMemory() {
} // namespace
extern "C" {
+// This code tries to make malloc failures fatal for security reasons. However,
+// it breaks builds depending on fine details of the linker command line and
+// the dependencies of other .so's that we pull in. So it's disabled for the
+// moment. See crbug.com/31809
+
+#if 0
#if !defined(LINUX_USE_TCMALLOC)
typedef void* (*malloc_type)(size_t size);
@@ -599,6 +605,7 @@ int posix_memalign(void** ptr, size_t alignment, size_t size) {
}
#endif // !defined(LINUX_USE_TCMALLOC)
+#endif
} // extern C
void EnableTerminationOnOutOfMemory() {