From fbfbccd749fc6e35d3bf65444e22e8641f0b4453 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Wed, 19 Feb 2025 21:14:31 +0100 Subject: [PATCH] Prevent segfaults with ddtrace.disable=1 when appsec is active Signed-off-by: Bob Weinand --- ext/ddtrace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/ddtrace.c b/ext/ddtrace.c index bf583eff36..798327fff4 100644 --- a/ext/ddtrace.c +++ b/ext/ddtrace.c @@ -1413,6 +1413,9 @@ static PHP_MINIT_FUNCTION(ddtrace) { mod_ptr->handle = NULL; /* }}} */ + // Make sure it's available for appsec, i.e. before disabling + dd_ip_extraction_startup(); + if (ddtrace_disable) { return SUCCESS; } @@ -1452,7 +1455,6 @@ static PHP_MINIT_FUNCTION(ddtrace) { ddtrace_engine_hooks_minit(); ddtrace_integrations_minit(); - dd_ip_extraction_startup(); ddtrace_serializer_startup(); ddtrace_live_debugger_minit();