diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-26 00:48:02 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-26 00:48:02 +0000 |
| commit | 7ce9cfdca5e4e161a7db2003d03561ce3272b2db (patch) | |
| tree | 5d745b2981f90f7782842fa78e9721f397f5471a /base | |
| parent | c84c479fdf0ff331f11e17a9753686d21d2ee16b (diff) | |
| download | chromium_src-7ce9cfdca5e4e161a7db2003d03561ce3272b2db.zip chromium_src-7ce9cfdca5e4e161a7db2003d03561ce3272b2db.tar.gz chromium_src-7ce9cfdca5e4e161a7db2003d03561ce3272b2db.tar.bz2 | |
[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=243949
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/121043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242508 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. |