From a8687804bb73deff52206f3dec88880fc22ad9b0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Sep 2020 20:35:33 +0200 Subject: [PATCH] Disable ifunc resolvers under dataflow sanitizer As with other sanitizers, this is not supported. --- Zend/zend_portability.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index b94ed7b55f9..e94560d18f0 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -466,7 +466,8 @@ extern "C++" { /* Memory sanitizer is incompatible with ifunc resolvers. Even if the resolver * is marked as no_sanitize("memory") it will still be instrumented and crash. */ -#if __has_feature(memory_sanitizer) || __has_feature(thread_sanitizer) +#if __has_feature(memory_sanitizer) || __has_feature(thread_sanitizer) || \ + __has_feature(dataflow_sanitizer) # undef HAVE_FUNC_ATTRIBUTE_IFUNC #endif