Fixed issue #2386: Crashes when running context_get in an exception thrown from an internal function

derickr · derickr · commit 10a06ffaac89 · 2025-11-18T09:48:35.000Z
diff --git a/src/debugger/handler_dbgp.c b/src/debugger/handler_dbgp.c
@@ -2132,6 +2132,7 @@ static int attach_context_vars(xdebug_xml_node *node, xdebug_var_export_options
 	}
 
 	if (
+		ZEND_USER_CODE(EG(current_execute_data)->func->type) &&
 		EG(current_execute_data)->opline->opcode == ZEND_EXT_STMT &&
 		(
 			EG(current_execute_data)->opline->op1_type == IS_VAR || EG(current_execute_data)->opline->op1_type == IS_TMP_VAR
diff --git a/tests/debugger/bug02386.inc b/tests/debugger/bug02386.inc
@@ -0,0 +1,2 @@
+<?php
+date('Y-m-d', new DateTimeImmutable('now'));
diff --git a/tests/debugger/bug02386.phpt b/tests/debugger/bug02386.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Test for bug #2386: Crashes when running context_get in an exception thrown from an internal function
+--SKIPIF--
+<?php
+require __DIR__ . '/../utils.inc';
+check_reqs('dbgp');
+?>
+--FILE--
+<?php
+require 'dbgp/dbgpclient.php';
+$filename = dirname(__FILE__) . '/bug02386.inc';
+
+$commands = array(
+	"breakpoint_set -t exception -x *",
+	'run',
+	"context_get",
+	'detach',
+);
+
+dbgpRunFile( $filename, $commands );
+?>
+--EXPECTF--
+<?xml version="1.0" encoding="iso-8859-1"?>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://bug02386.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid=""><engine version=""><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[https://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2099 by Derick Rethans]]></copyright></init>
+
+-> breakpoint_set -i 1 -t exception -x *
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_set" transaction_id="1" id="{{PID}}0001"></response>
+
+-> run -i 2
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="run" transaction_id="2" status="break" reason="ok"><xdebug:message filename="file://bug02386.inc" lineno="2" exception="TypeError"><![CDATA[date(): Argument #2 ($timestamp) must be of type ?int, DateTimeImmutable given]]></xdebug:message></response>
+
+-> context_get -i 3
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="context_get" transaction_id="3" context="0"></response>
+
+-> detach -i 4
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="detach" transaction_id="4" status="stopping" reason="ok"></response>

Original file line number	Diff line number	Diff line change
`@@ -2132,6 +2132,7 @@ static int attach_context_vars(xdebug_xml_node *node, xdebug_var_export_options`
`2132`	`2132`	`}`
`2133`	`2133`
`2134`	`2134`	`if (`
	`2135`	`+ ZEND_USER_CODE(EG(current_execute_data)->func->type) &&`
`2135`	`2136`	`EG(current_execute_data)->opline->opcode == ZEND_EXT_STMT &&`
`2136`	`2137`	`(`
`2137`	`2138`	`EG(current_execute_data)->opline->op1_type == IS_VAR \|\| EG(current_execute_data)->opline->op1_type == IS_TMP_VAR`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<?php`
	`2`	`+date('Y-m-d', new DateTimeImmutable('now'));`