Fix EnableTerminationOnOutOfMemory for malloc

skia/ext/SkMemory_new_handler.cpp

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <new>
 
 #include "base/process/memory.h"
 
@@ skipping 42 matching lines @@
 static void* sk_malloc_nothrow(size_t size) {
     // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
     // doesn't work as intended everywhere.
 #if  defined(LIBC_GLIBC) || defined(USE_TCMALLOC) || \
      (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_ANDROID)
     void* result;
     // It's the responsibility of the caller to check the return value.
     ignore_result(base::UncheckedMalloc(size, &result));
     return result;
 #else
-    // This is not really thread safe.  It only won't collide with itself, but we're totally

[cpu_(ooo_6.6-7.5), 2015/01/10 05:37:28]

this code is wrong. libraries shall not to touch global crt state, which btw the
std::set_new_handler and the _set_new_handler() are not the same so this code
was not doing anything: old_handler is 0 even if _set_new_handler is active
which means that OOM still crashes.

I mean other than grabbing/release 3 or 4 locks for each allocation.

[grt (UTC plus 2), 2015/01/12 14:29:14]

Should this use base::UncheckedMalloc on Win as well (ignoring for the moment
that it just calls through to malloc, and hence is really a checked malloc)
since that seems to be the intent here? That way this code will automatically do
what is intended if someone makes base::UncheckedMalloc work on Win.

-    // unprotected from races with other code that calls set_new_handler.
-    SkAutoMutexAcquire lock(gSkNewHandlerMutex);
-    std::new_handler old_handler = std::set_new_handler(NULL);
-    void* p = malloc(size);
-    std::set_new_handler(old_handler);
-    return p;
+    return malloc(size);
 #endif
 }
 
 void* sk_malloc_flags(size_t size, unsigned flags) {
     if (flags & SK_MALLOC_THROW) {
         return sk_malloc_throw(size);
     }
     return sk_malloc_nothrow(size);
 }
 
 void* sk_calloc_throw(size_t size) {
     return throw_on_failure(size, calloc(size, 1));
 }
 
 void* sk_calloc(size_t size) {
     // TODO(b.kelemen): we should always use UncheckedCalloc but currently it
     // doesn't work as intended everywhere.
 #if  defined(LIBC_GLIBC) || defined(USE_TCMALLOC) || \
      (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_ANDROID)
     void* result;
     // It's the responsibility of the caller to check the return value.
     ignore_result(base::UncheckedCalloc(size, 1, &result));
     return result;
 #else
-    SkAutoMutexAcquire lock(gSkNewHandlerMutex);
-    std::new_handler old_handler = std::set_new_handler(NULL);
-    void* p = calloc(size, 1);
-    std::set_new_handler(old_handler);
-    return p;
+    return calloc(size, 1);
 #endif
 }