summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-09-01 20:35:33 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-09-01 20:37:43 +0200
commita8687804bb73deff52206f3dec88880fc22ad9b0 (patch)
treebae8847c4dea6faeef88d04500bc7fddfcc456b3
parentc6ea0e90c29bf747b5c4618831924da10bd6d601 (diff)
downloadphp-git-a8687804bb73deff52206f3dec88880fc22ad9b0.tar.gz
Disable ifunc resolvers under dataflow sanitizer
As with other sanitizers, this is not supported.
-rw-r--r--Zend/zend_portability.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index b94ed7b55f..e94560d18f 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