diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 20:27:18 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 20:27:18 +0000 |
| commit | d21a2ac375b3abf843c5fb4451e96e265bf66b7a (patch) | |
| tree | 2388728c06f7abbfdd25f425f371976fd7c55193 /base/process_util_mac.mm | |
| parent | ac084442a04ed742bd4408d7e5ca1756e2e3b79d (diff) | |
| download | chromium_src-d21a2ac375b3abf843c5fb4451e96e265bf66b7a.zip chromium_src-d21a2ac375b3abf843c5fb4451e96e265bf66b7a.tar.gz chromium_src-d21a2ac375b3abf843c5fb4451e96e265bf66b7a.tar.bz2 | |
Temporarily allow writing to the default malloc zone structure while modifying it.
BUG=none
TEST=no crash when launching Chromium next year
Review URL: http://codereview.chromium.org/557084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_mac.mm')
| -rw-r--r-- | base/process_util_mac.mm | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm index 9c0a2a4..faae5bf 100644 --- a/base/process_util_mac.mm +++ b/base/process_util_mac.mm @@ -12,6 +12,7 @@ #include <mach/task.h> #include <malloc/malloc.h> #include <spawn.h> +#include <sys/mman.h> #include <sys/sysctl.h> #include <sys/types.h> #include <sys/wait.h> @@ -22,6 +23,7 @@ #include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/string_util.h" +#include "base/sys_info.h" #include "base/sys_string_conversions.h" #include "base/time.h" @@ -423,7 +425,25 @@ void EnableTerminationOnOutOfMemory() { // Nevertheless this is better than nothing for now. // TODO(avi):Do better. http://crbug.com/12673 + int32 major; + int32 minor; + int32 bugfix; + SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); + bool zone_allocators_protected = ((major == 10 && minor > 6) || major > 10); + malloc_zone_t* default_zone = malloc_default_zone(); + + vm_address_t page_start = NULL; + vm_size_t len = 0; + if (zone_allocators_protected) { + // See http://trac.webkit.org/changeset/53362/trunk/WebKitTools/DumpRenderTree/mac + page_start = reinterpret_cast<vm_address_t>(default_zone) & + static_cast<vm_size_t>(~(getpagesize() - 1)); + len = reinterpret_cast<vm_address_t>(default_zone) - + page_start + sizeof(malloc_zone_t); + mprotect(reinterpret_cast<void*>(page_start), len, PROT_READ | PROT_WRITE); + } + g_old_malloc = default_zone->malloc; g_old_calloc = default_zone->calloc; g_old_valloc = default_zone->valloc; @@ -435,6 +455,10 @@ void EnableTerminationOnOutOfMemory() { default_zone->calloc = oom_killer_calloc; default_zone->valloc = oom_killer_valloc; default_zone->realloc = oom_killer_realloc; + + if (zone_allocators_protected) { + mprotect(reinterpret_cast<void*>(page_start), len, PROT_READ); + } } } // namespace base |