commit aecb849c3f728f4cec86fb1ac7a79e8a0d0cf7ee
author Steven Moreland <smoreland@google.com> Fri Oct 02 21:02:55 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 02 21:02:55 2020 +0000
tree e5f4af276a80ad6937ff42e45203d001dd99784a
parent 538289b2ca76bc22f3034f84e0d4df04ecd2f7fd
parent ddec45d4f3a76ddbee9667c8f0028159ea64db29

Merge "Avoid heap initialization for skia allocations." am: ddec45d4f3

Original change: https://android-review.googlesource.com/c/platform/external/skia/+/1431544

Change-Id: I4e1aaf9b66b63c5ac5c8c9f9c080b1f538917ee6

src/ports/SkMemory_malloc.cpp

diff --git a/src/ports/SkMemory_malloc.cpp b/src/ports/SkMemory_malloc.cpp
index 89e2109..2952632 100644
--- a/src/ports/SkMemory_malloc.cpp
+++ b/src/ports/SkMemory_malloc.cpp
@@ -68,7 +68,21 @@
     if (flags & SK_MALLOC_ZERO_INITIALIZE) {
         p = calloc(size, 1);
     } else {
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(__BIONIC__)
+        /* TODO: After b/169449588 is fixed, we will want to change this to restore
+         *       original behavior instead of always disabling the flag.
+         * TODO: After b/158870657 is fixed and scudo is used globally, we can assert when an
+         *       an error is returned.
+         */
+        // malloc() generally doesn't initialize its memory and that's a huge security hole,
+        // so Android has replaced its malloc() with one that zeros memory,
+        // but that's a huge performance hit for HWUI, so turn it back off again.
+        (void)mallopt(M_THREAD_DISABLE_MEM_INIT, 1);
+#endif
         p = malloc(size);
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(__BIONIC__)
+        (void)mallopt(M_THREAD_DISABLE_MEM_INIT, 0);
+#endif
     }
     if (flags & SK_MALLOC_THROW) {
         return throw_on_failure(size, p);