Merged pull request xdebug#1022

Author: derickr

src/develop/stack.c

@@ -463,7 +463,7 @@ static void zval_from_stack_add_frame(zval *output, function_stack_entry *fse, z
 
 	zval_from_stack_add_frame_parameters(frame, fse, params_as_values);
 
-	if (add_local_vars && fse->op_array && fse->op_array->vars && !(fse->function.type & XFUNC_INCLUDES)) {
+	if (add_local_vars && fse->op_array && fse->op_array->type == ZEND_USER_FUNCTION && fse->op_array->vars && !(fse->function.type & XFUNC_INCLUDES)) {
 		zval_from_stack_add_frame_variables(frame, edata, fse->symbol_table, fse->op_array);
 	}
 

tests/develop/bug02352-php80.phpt

@@ -0,0 +1,41 @@
+--TEST--
+Test for bug #2352: Crash with storing exception traces and __invoke (< PHP 8.1)
+--SKIPIF--
+<?php
+require __DIR__ . '/../utils.inc';
+check_reqs('PHP < 8.1');
+?>
+--INI--
+xdebug.mode=develop
+--FILE--
+<?php
+class RedisProxy {
+	function __construct(public Closure $c)
+	{
+	}
+
+	function __call($method, $args)
+	{
+		$this->c->__invoke($args);
+	}
+}
+
+$c = function(array $args)
+{
+	throw new Exception();
+};
+
+$rp = new RedisProxy($c);
+$rp->isConnected();
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception in %sbug02352-php80.php on line 15
+
+Exception:  in %sbug02352-php80.php on line 15
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug02352-php80.php:0
+%w%f %w%d   2. RedisProxy->isConnected() %sbug02352-php80.php:19
+%w%f %w%d   3. RedisProxy->__call($method = 'isConnected', $args = []) %sbug02352-php80.php:19
+%w%f %w%d   4. Closure->__invoke(%s = []) %sbug02352-php80.php:9
+%w%f %w%d   5. {closure:%sbug02352-php80.php:13-16}($args = []) %sbug02352-php80.php:9

tests/develop/bug02352-php81.phpt

@@ -0,0 +1,40 @@
+--TEST--
+Test for bug #2352: Crash with storing exception traces and __invoke (= PHP 8.1)
+--SKIPIF--
+<?php
+require __DIR__ . '/../utils.inc';
+check_reqs('PHP >= 8.1, < 8.2');
+?>
+--INI--
+xdebug.mode=develop
+--FILE--
+<?php
+class RedisProxy {
+	function __construct(public Closure $c)
+	{
+	}
+
+	function __call($method, $args)
+	{
+		$this->c->__invoke($args);
+	}
+}
+
+$c = function(array $args)
+{
+	throw new Exception();
+};
+
+$rp = new RedisProxy($c);
+$rp->isConnected();
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception in %sbug02352-php81.php on line 15
+
+Exception:  in %sbug02352-php81.php on line 15
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug02352-php81.php:0
+%w%f %w%d   2. RedisProxy->__call($method = 'isConnected', $args = []) %sbug02352-php81.php:19
+%w%f %w%d   3. Closure->__invoke(%s = []) %sbug02352-php81.php:9
+%w%f %w%d   4. {closure:%sbug02352-php81.php:13-16}($args = []) %sbug02352-php81.php:9

tests/develop/bug02352-php82.phpt

@@ -0,0 +1,39 @@
+--TEST--
+Test for bug #2352: Crash with storing exception traces and __invoke (>= PHP 8.2)
+--SKIPIF--
+<?php
+require __DIR__ . '/../utils.inc';
+check_reqs('PHP >= 8.2');
+?>
+--INI--
+xdebug.mode=develop
+--FILE--
+<?php
+class RedisProxy {
+	function __construct(public Closure $c)
+	{
+	}
+
+	function __call($method, $args)
+	{
+		$this->c->__invoke($args);
+	}
+}
+
+$c = function(array $args)
+{
+	throw new Exception();
+};
+
+$rp = new RedisProxy($c);
+$rp->isConnected();
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception in %sbug02352-php82.php on line 15
+
+Exception:  in %sbug02352-php82.php on line 15
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug02352-php82.php:0
+%w%f %w%d   2. RedisProxy->__call($method = 'isConnected', $args = []) %sbug02352-php82.php:19
+%w%f %w%d   3. {closure:%sbug02352-php82.php:13-16}($args = []) %sbug02352-php82.php:9