Merged pull request xdebug#1031

Author: derickr

src/lib/var_export_xml.c

@@ -411,18 +411,17 @@ static int xdebug_object_element_export_xml_node(xdebug_object_item *item_nptr,
 		xdebug_xml_add_child(parent, node);
 
 #if PHP_VERSION_ID >= 80400
-		{
+		if (
+			ZEND_USER_CODE((*item)->zobj->ce->type) &&
+			Z_TYPE_P((*item)->zv) == IS_PTR
+		) {
 			zend_property_info *prop_info = Z_PTR_P((*item)->zv);
 			HashTable *props = zend_get_properties_no_lazy_init((*item)->zobj);
+			zval *tmp_value_for_ptr = zend_symtable_str_find(props, ZSTR_VAL(prop_info->name), ZSTR_LEN(prop_info->name));
 
-			// IS_PTR is for properties with hooks
-			if (Z_TYPE_P((*item)->zv) == IS_PTR) {
-				zval *tmp_value_for_ptr = zend_symtable_str_find(props, ZSTR_VAL(prop_info->name), ZSTR_LEN(prop_info->name));
-
-				xdebug_var_export_xml_node(&tmp_value_for_ptr, tmp_fullname ? tmp_fullname : NULL, node, options, level + 1);
-			} else {
-				xdebug_var_export_xml_node(&((*item)->zv), tmp_fullname ? tmp_fullname : NULL, node, options, level + 1);
-			}
+			xdebug_var_export_xml_node(&tmp_value_for_ptr, tmp_fullname ? tmp_fullname : NULL, node, options, level + 1);
+		} else {
+			xdebug_var_export_xml_node(&((*item)->zv), tmp_fullname ? tmp_fullname : NULL, node, options, level + 1);
 		}
 #else
 		xdebug_var_export_xml_node(&((*item)->zv), tmp_fullname ? tmp_fullname : NULL, node, options, level + 1);

tests/debugger/bug02360.inc

@@ -0,0 +1,5 @@
+<?php
+$KEEP_EOL = new DateInterval('P28D');
+
+echo get_class($KEEP_EOL);
+?>

tests/debugger/bug02360.phpt

@@ -0,0 +1,40 @@
+--TEST--
+Test for bug #2360: Debugging DateInterval causes a crash
+--SKIPIF--
+<?php
+require __DIR__ . '/../utils.inc';
+check_reqs('dbgp');
+?>
+--FILE--
+<?php
+require 'dbgp/dbgpclient.php';
+$filename = dirname(__FILE__) . '/bug02360.inc';
+
+$commands = array(
+	"breakpoint_set -t line -f file://{$filename} -n 4",
+	'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://bug02360.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 line -f file://bug02360.inc -n 4
+<?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://bug02360.inc" lineno="4"></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"><property name="$KEEP_EOL" fullname="$KEEP_EOL" type="object" classname="DateInterval" children="1" %s</property></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>