Avoid resumption of unfinished hooks on PHP 7

bwoebi · bwoebi · commit b310ddd20ba6 · 2026-01-02T15:17:52.000+01:00
Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/tests/ext/bailout_double_hook_clear.phpt b/tests/ext/bailout_double_hook_clear.phpt
@@ -1,10 +1,14 @@
 --TEST--
 Bailout during hook END should not cause double-clear of span (internal function)
---SKIPIF--
-<?php if (PHP_VERSION_ID >= 80000) die('skip: PHP 7 only'); ?>
 --FILE--
 <?php
 
+DDTrace\trace_function('array_sum', [
+    'posthook' => function(\DDTrace\SpanData $data, $args, $retval) {
+        echo "Hook 0 END\n";
+    }
+]);
+
 DDTrace\trace_function('array_sum', [
     'prehook' => function (\DDTrace\SpanData $data, $args) {
         echo "HOOK 1 PRE\n";
diff --git a/zend_abstract_interface/hook/hook.c b/zend_abstract_interface/hook/hook.c
@@ -1112,12 +1112,6 @@ void zai_hook_finish(zend_execute_data *ex, zval *rv, zai_hook_memory_t *memory)
     for (zai_hook_info *hook_start = memory->dynamic, *hook_info = hook_start + memory->hook_count - 1; hook_info >= hook_start; --hook_info) {
         zai_hook_t *hook = hook_info->hook;
 
-        // if we propagate bailout during hook->end, we don't try to finish
-        // again in zai_interceptor_terminate_all_pending_observers
-        // This may even segfault due to too many calls to
-        // ddtrace_clear_execute_data_span
-        memory->hook_count--;
-
         if (hook->end) {
             hook->end(memory->invocation, ex, rv, hook->aux.data, (char *)memory->dynamic + hook_info->dynamic_offset);
         }
diff --git a/zend_abstract_interface/interceptor/php7/interceptor.c b/zend_abstract_interface/interceptor/php7/interceptor.c
@@ -506,7 +506,8 @@ static inline void zai_interceptor_execute_internal_impl(zend_execute_data *exec
             func->internal_function.handler(execute_data, return_value);
         }
 
-        zai_hook_finish(execute_data, return_value, &stored_frame_memory->hook_data);
+        stored_frame_memory->implicit = true; // prevent double-finish on bailout
+        zai_hook_finish(execute_data, return_value, &frame_memory.hook_data);
         zai_hook_memory_table_del(execute_data);
     } else {
         skip: ;

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,8 @@ static inline void zai_interceptor_execute_internal_impl(zend_execute_data *exec`
`506`	`506`	`func->internal_function.handler(execute_data, return_value);`
`507`	`507`	`}`
`508`	`508`
`509`		`- zai_hook_finish(execute_data, return_value, &stored_frame_memory->hook_data);`
	`509`	`+ stored_frame_memory->implicit = true; // prevent double-finish on bailout`
	`510`	`+ zai_hook_finish(execute_data, return_value, &frame_memory.hook_data);`
`510`	`511`	`zai_hook_memory_table_del(execute_data);`
`511`	`512`	`} else {`
`512`	`513`	`skip: ;`