diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 17:46:52 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 17:46:52 +0000 |
| commit | b7358af8e8cf4538d1ddc788ec08b7987031d996 (patch) | |
| tree | cda1cadec6ab622c00fd86f84bad240c41df0874 /base | |
| parent | 8c4445c03b8e8049a4e37c7d5f45634430ef16ed (diff) | |
| download | chromium_src-b7358af8e8cf4538d1ddc788ec08b7987031d996.zip chromium_src-b7358af8e8cf4538d1ddc788ec08b7987031d996.tar.gz chromium_src-b7358af8e8cf4538d1ddc788ec08b7987031d996.tar.bz2 | |
Merge 242508 "[osx] Fix UncheckedMalloc() again."
> [osx] Fix UncheckedMalloc() again.
>
> r242238 attempted to expand the CrMallocErrorBreak() support for
> UncheckedMalloc() to handle 10.9. Unfortunately, the ordering of the
> condition means that it actually broke things for all versions of OSX.
>
> BUG=312234
> TBR=mark@chromium.org
>
> Review URL: https://codereview.chromium.org/121043002
TBR=shess@chromium.org
Review URL: https://codereview.chromium.org/114473007
git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@243325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/process/memory_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/process/memory_mac.mm b/base/process/memory_mac.mm index 2e48e78..3e281cd 100644 --- a/base/process/memory_mac.mm +++ b/base/process/memory_mac.mm @@ -133,7 +133,7 @@ void CrMallocErrorBreak() { // as EBADF. Unfortunately, 10.9's opensource releases don't include malloc // source code at this time. // <http://crbug.com/312234> - if (g_unchecked_alloc.Get().Get() && (errno == EBADF || errno == EPERM)) + if ((errno == EBADF || errno == EPERM) && g_unchecked_alloc.Get().Get()) return; // A unit test checks this error message, so it needs to be in release builds. |