commit 4edbcee2c65bd38efae1411a847a6af9b22642fc
author Evgenii Stepanov <eugenis@google.com> Fri Sep 17 14:59:15 2021 -0700
committer Evgenii Stepanov <eugenis@google.com> Fri Sep 24 11:21:38 2021 -0700
tree 1af7f53978b666aa035b49e6dba3a5d755a3217b
parent e8121199fdd83b81933eb0a558e7ea33b8bdd19e

Random HWASan cleanups.

Makes CtsBionicTestCases pass under HWASan.

Bug: 193568145
Test: CtsBionicTestCases
Change-Id: I38ee8a8508827c0ffee61ce33bb8c6a3f40388c9

tests/malloc_test.cpp

diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp
index eae44ce..3f22007 100644
--- a/tests/malloc_test.cpp
+++ b/tests/malloc_test.cpp
@@ -700,7 +700,10 @@
   FILE* fp = fdopen(tf.fd, "w+");
   tf.release();
   ASSERT_TRUE(fp != nullptr);
-  ASSERT_EQ(0, malloc_info(0, fp));
+  if (malloc_info(0, fp) != 0) {
+    *allocator_scudo = false;
+    return;
+  }
   ASSERT_EQ(0, fclose(fp));
 
   std::string contents;