Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2342)

Unified Diff: base/process_util_linux.cc

Issue 524075: Linux: disable malloc tricks to unbreak Ubuntu build. (Closed)
Patch Set: Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/process_util_linux.cc
diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc
index 1a7e0906210185d09f9b567a9220bee6a50bfd93..8d488248fed5b92484d6f9465f26b618519ace57 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() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698