diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 19:04:18 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 19:04:18 +0000 |
| commit | fb0b70ed567c03c17a22ee1d6c5fff9473f3505b (patch) | |
| tree | 8c112cf3cd1f26b124334dc70d394075d4bef48b /base | |
| parent | fb6de399a7eead8338e4f49920feed47d122fec3 (diff) | |
| download | chromium_src-fb0b70ed567c03c17a22ee1d6c5fff9473f3505b.zip chromium_src-fb0b70ed567c03c17a22ee1d6c5fff9473f3505b.tar.gz chromium_src-fb0b70ed567c03c17a22ee1d6c5fff9473f3505b.tar.bz2 | |
Linux: disable malloc tricks to unbreak Ubuntu build.
BUG=31809
TEST=Run chromium-browser on Ubuntu. It should work.
http://codereview.chromium.org/524075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_linux.cc | 7 |
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() { |