commit 79ae0e1d6037cb42a791c45e7f3abf891b54cbc2
author Pirama Arumuga Nainar <pirama@google.com> Wed Mar 17 04:21:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 17 04:21:23 2021 +0000
tree 42d5f370589761d1f861d91bbba4b7f6af58c50f
parent 3fc1885aa65006cd233d8aaa56939e0910bb31c7
parent bb03b3626f9e9d0a8f07776d8b9632e5029e0185

Merge "Ignore deliberate free() of non-heap memory" am: bb03b3626f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1640702

Change-Id: I960c2109cc590e7d39b7a658b9a1617911b255c5

debuggerd/crasher/Android.bp

diff --git a/debuggerd/crasher/Android.bp b/debuggerd/crasher/Android.bp
index 7975a3a..23b106e 100644
--- a/debuggerd/crasher/Android.bp
+++ b/debuggerd/crasher/Android.bp
@@ -13,7 +13,6 @@
         "-Werror",
         "-O0",
         "-fstack-protector-all",
-        "-Wno-free-nonheap-object",
         "-Wno-date-time",
     ],
     srcs: ["crasher.cpp"],

debuggerd/crasher/crasher.cpp

diff --git a/debuggerd/crasher/crasher.cpp b/debuggerd/crasher/crasher.cpp
index a2b13a3..db30b8f 100644
--- a/debuggerd/crasher/crasher.cpp
+++ b/debuggerd/crasher/crasher.cpp
@@ -134,10 +134,14 @@
     return a*2;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wfree-nonheap-object"
+
 noinline void abuse_heap() {
     char buf[16];
     free(buf); // GCC is smart enough to warn about this, but we're doing it deliberately.
 }
+#pragma clang diagnostic pop
 
 noinline void leak() {
     while (true) {