diff --git a/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test_main.cpp b/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test_main.cpp --- a/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test_main.cpp +++ b/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test_main.cpp @@ -8,6 +8,14 @@ #include "tests/scudo_unit_test.h" +// Match Android's default configuration, which disables Scudo's mismatch +// allocation check, as it is being triggered by some third party code. +#if SCUDO_ANDROID +#define DEALLOC_TYPE_MISMATCH "false" +#else +#define DEALLOC_TYPE_MISMATCH "true" +#endif + // This allows us to turn on/off a Quarantine for specific tests. The Quarantine // parameters are on the low end, to avoid having to loop excessively in some // tests. @@ -15,9 +23,10 @@ extern "C" __attribute__((visibility("default"))) const char * __scudo_default_options() { if (!UseQuarantine) - return "dealloc_type_mismatch=true"; + return "dealloc_type_mismatch=" DEALLOC_TYPE_MISMATCH; return "quarantine_size_kb=256:thread_local_quarantine_size_kb=128:" - "quarantine_max_chunk_size=512:dealloc_type_mismatch=true"; + "quarantine_max_chunk_size=512:" + "dealloc_type_mismatch=" DEALLOC_TYPE_MISMATCH; } int main(int argc, char **argv) {