commit e4629ce327ced09f4d69fec2e8d842e401aaa1f7
author Peter Collingbourne <peter@pcc.me.uk> Mon Feb 10 15:53:07 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Aug 27 23:56:57 2020 -0700
tree cacdd8e828425b4705aaebc2b2041c76b731979f
parent b8e1c4cc6f7f061ea80253e3881329b32f2343bc

scudo: Fix Android build.

Differential Revision: https://reviews.llvm.org/D74366

GitOrigin-RevId: e79c3b4c2d22256d8e66b6a908268e83bc8c4634

wrappers_c.inc

diff --git a/wrappers_c.inc b/wrappers_c.inc
index 5721b01..91f615d 100644
--- a/wrappers_c.inc
+++ b/wrappers_c.inc
@@ -182,8 +182,8 @@
 INTERFACE WEAK int SCUDO_PREFIX(malloc_info)(UNUSED int options, FILE *stream) {
   const scudo::uptr max_size =
       decltype(SCUDO_ALLOCATOR)::PrimaryT::SizeClassMap::MaxSize;
-  auto *sizes =
-      static_cast<scudo::uptr *>(calloc(max_size, sizeof(scudo::uptr)));
+  auto *sizes = static_cast<scudo::uptr *>(
+      SCUDO_PREFIX(calloc)(max_size, sizeof(scudo::uptr)));
   auto callback = [](uintptr_t, size_t size, void* arg) {
     auto *sizes = reinterpret_cast<scudo::uptr *>(arg);
     if (size < max_size)
@@ -196,7 +196,7 @@
     if (sizes[i])
       fprintf(stream, "<alloc size=\"%lu\" count=\"%lu\"/>\n", i, sizes[i]);
   fputs("</malloc>\n", stream);
-  free(sizes);
+  SCUDO_PREFIX(free)(sizes);
   return 0;
 }