Fix removal of the directly accessed hook after binding in DDTrace\remove_hook

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

tests/ext/sandbox/install_hook/exclude_inherited_hook_after_binding.phpt

@@ -0,0 +1,28 @@
+--TEST--
+remove_hook() with class argument
+--FILE--
+<?php
+
+interface Elder {
+    function foo();
+}
+
+$id = DDTrace\install_hook("Elder::foo", function () { print "HOOKED: " . static::class . "\n"; });
+
+if (time()) {
+    abstract class Child implements Elder {}
+
+    class GrandChild extends Child {
+        function foo() {
+            print static::class . "\n";
+        }
+    }
+}
+
+DDTrace\remove_hook($id, "GrandChild");
+
+(new GrandChild)->foo(); // no hook
+
+?>
+--EXPECT--
+GrandChild

tests/ext/sandbox/install_hook/remove_hook_null_logger.phpt

@@ -0,0 +1,43 @@
+--TEST--
+Remove hook
+--ENV--
+DD_TRACE_LOGS_ENABLED=false
+--FILE--
+<?php
+
+namespace Psr\Log {
+    interface LoggerInterface {
+        public function log($level, $message, array $context = array());
+    }
+
+    abstract class AbstractLogger implements LoggerInterface {
+        public function log($level, $message, array $context = array()) {
+            echo static::class . "\n";
+        }
+    }
+
+    class NullLogger extends AbstractLogger {
+        public function log($level, $message, array $context = array()) {
+            echo static::class . "\n";
+        }
+    }
+}
+
+
+namespace {
+    $hook = \DDTrace\install_hook("Psr\Log\LoggerInterface::log", function () {
+        echo "HOOKED: " . static::class . "\n";
+    });
+    \DDTrace\remove_hook($hook, \Psr\Log\NullLogger::class);
+
+    $logger = new \Psr\Log\NullLogger();
+    for ($i = 0; $i < 3; $i++) {
+        $logger->log("info", "Hello World!");
+    }
+}
+
+?>
+--EXPECTF--
+Psr\Log\NullLogger
+Psr\Log\NullLogger
+Psr\Log\NullLogger

zend_abstract_interface/hook/hook.c

@@ -472,7 +472,7 @@ static inline void zai_hook_resolved_install_shared_hook(zai_hook_t *hook, zend_
 static inline void zai_hook_resolved_install_abstract_recursive(zai_hook_t *hook, zend_ulong index, zend_class_entry *scope) {
     // find implementers by searching through all inheritors, recursively, stopping upon finding a non-abstract implementation
     zai_hook_inheritor_list *inheritors;
-    zend_ulong ce_addr = ((zend_ulong)scope) << 3;
+    zend_ulong ce_addr = ((zend_ulong)scope) >> 3;
     if ((inheritors = zend_hash_index_find_ptr(&zai_hook_tls->inheritors, ce_addr))) {
         for (size_t i = inheritors->size; i--;) {
             zend_class_entry *inheritor = inheritors->inheritor[i];
@@ -490,7 +490,7 @@ static inline void zai_hook_resolved_install_abstract_recursive(zai_hook_t *hook
 static inline void zai_hook_resolved_install_inherited_internal_function_recursive(zai_hook_t *hook, zend_ulong index, zend_class_entry *scope, zif_handler handler) {
     // find implementers by searching through all inheritors, recursively, stopping upon finding an explicit override
     zai_hook_inheritor_list *inheritors;
-    zend_ulong ce_addr = ((zend_ulong)scope) << 3;
+    zend_ulong ce_addr = ((zend_ulong)scope) >> 3;
     if ((inheritors = zend_hash_index_find_ptr(&zai_hook_tls->inheritors, ce_addr))) {
         for (size_t i = inheritors->size; i--;) {
             zend_class_entry *inheritor = inheritors->inheritor[i];
@@ -554,7 +554,7 @@ static zend_long zai_hook_request_install(zai_hook_t *hook) {
 static inline void zai_hook_register_inheritor(zend_class_entry *child, zend_class_entry *parent, bool persistent) {
     const size_t min_size = 7;
 
-    zend_ulong addr = ((zend_ulong)parent) << 3;
+    zend_ulong addr = ((zend_ulong)parent) >> 3;
     zai_hook_inheritor_list *inheritors;
     zval *inheritors_zv;
     HashTable *ht = persistent ? &zai_hook_static_inheritors : &zai_hook_tls->inheritors;
@@ -842,7 +842,7 @@ static inline void zai_hook_remove_shared_hook(zend_function *func, zend_ulong h
 static void zai_hook_remove_abstract_recursive(zai_hooks_entry *base_hooks, zend_class_entry *scope, zend_string *function_name, zend_ulong hook_id) {
     // find implementers by searching through all inheritors, recursively, stopping upon finding a non-abstract implementation
     zai_hook_inheritor_list *inheritors;
-    zend_ulong ce_addr = ((zend_ulong)scope) << 3;
+    zend_ulong ce_addr = ((zend_ulong)scope) >> 3;
     if ((inheritors = zend_hash_index_find_ptr(&zai_hook_tls->inheritors, ce_addr))) {
         for (size_t i = inheritors->size; i--;) {
             zend_class_entry *inheritor = inheritors->inheritor[i];
@@ -860,7 +860,7 @@ static void zai_hook_remove_abstract_recursive(zai_hooks_entry *base_hooks, zend
 static void zai_hook_remove_internal_inherited_recursive(zend_class_entry *scope, zend_string *function_name, zend_ulong hook_id, zif_handler handler) {
     // find implementers by searching through all inheritors, recursively, stopping upon finding an explicit override
     zai_hook_inheritor_list *inheritors;
-    zend_ulong ce_addr = ((zend_ulong)scope) << 3;
+    zend_ulong ce_addr = ((zend_ulong)scope) >> 3;
     if ((inheritors = zend_hash_index_find_ptr(&zai_hook_tls->inheritors, ce_addr))) {
         for (size_t i = inheritors->size; i--;) {
             zend_class_entry *inheritor = inheritors->inheritor[i];
@@ -1276,12 +1276,12 @@ void zai_hook_exclude_class_resolved(zai_install_address function_address, zend_
     if (!hooks) {
         return;
     }
-    zai_hook_add_exclusion(hooks, index, lc_classname);
 
     zend_class_entry *ce = NULL;
     zend_string *function_name = hooks->resolved->common.function_name;
     zend_function *resolved = zai_hook_lookup_function(zai_str_from_zstr(lc_classname), zai_str_from_zstr(function_name), &ce);
     if (!ce || !resolved) {
+        zai_hook_add_exclusion(hooks, index, lc_classname);
         return;
     }
     zai_hooks_entry *excluded_hooks = zend_hash_index_find_ptr(&zai_hook_resolved, zai_hook_install_address(resolved));
@@ -1294,6 +1294,16 @@ void zai_hook_exclude_class_resolved(zai_install_address function_address, zend_
         return;
     }
 
+    zend_hash_index_del(&excluded_hooks->hooks, (zend_ulong) index);
+    if (zend_hash_num_elements(&excluded_hooks->hooks) == 0) {
+#if PHP_VERSION_ID >= 80200
+        if (excluded_hooks->internal_duplicate_count == 0)
+#endif
+        {
+            zai_hook_entries_remove_resolved((zend_ulong) function_address);
+        }
+    }
+
     zai_hook_remove_abstract_recursive(hooks, ce, function_name, (zend_ulong) index);
 }