Fix stacktarget handling in zai_hook_safe_finish

Signed-off-by: Bob Weinand <[email protected]>
DataDog · Oct 29, 2024 · db5ef76 · db5ef76
1 parent 2a9899e
commit db5ef76
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/zend_abstract_interface/interceptor/php8/interceptor.c b/zend_abstract_interface/interceptor/php8/interceptor.c
@@ -105,8 +105,12 @@ static void zai_hook_safe_finish(zend_execute_data *execute_data, zval *retval,
 #ifdef __SANITIZE_ADDRESS__
                 , "+r"(fake_stack)
 #endif
+#if PHP_VERSION_ID >= 80300
+                , "+r"(stacktarget)
+#else
             : "r"(stacktarget)
-#if defined(__SANITIZE_ADDRESS__) && defined(__aarch64__)
+#endif
+#if defined(__SANITIZE_ADDRESS__) && defined(__aarch64__) && !defined(__clang__)
             : "x7"
 #endif
             );