com php-src: Fix bug #75290: NEWS Zend/tests/bug75290.phpt Zend/zend_closures.c
| From: | Andrea Faulds | Date: | Fri, 29 Sep 2017 20:38:08 +0000 |
| Subject: | com php-src: Fix bug #75290: NEWS Zend/tests/bug75290.phpt Zend/zend_closures.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99584@lists.php.net to get a copy of this message | ||
Commit: abefb6dfe76c57803e49969185183c2b4ef9352e
Author: Andrea Faulds <ajf@ajf.me> Fri, 29 Sep 2017 21:38:08 +0100
Parents: d11fceab151cd0410645f81eb7444af4388470c3
Branches: PHP-7.0 PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=abefb6dfe76c57803e49969185183c2b4ef9352e
Log:
Fix bug #75290
Bugs:
https://bugs.php.net/75290
Changed paths:
M NEWS
A Zend/tests/bug75290.phpt
M Zend/zend_closures.c
Diff:
diff --git a/NEWS b/NEWS
index c3e5760..2a2881c 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ PHP NEWS
request). (Nikita)
. Fixed bug #75220 (Segfault when calling is_callable on parent).
(andrewnester)
+ . Fixed bug #75290 (debug info of Closures of internal functions contain
+ garbage argument names). (Andrea)
- litespeed:
. Fixed bug #75248 (Binary directory doesn't get created when building
diff --git a/Zend/tests/bug75290.phpt b/Zend/tests/bug75290.phpt
new file mode 100644
index 0000000..416af06
--- /dev/null
+++ b/Zend/tests/bug75290..phpt
@@ -0,0 +1,26 @@
+--TEST--
+Bug #75290 (debug info of Closures of internal functions contain garbage argument names)
+--FILE--
+<?php
+
+var_dump((new ReflectionFunction('sin'))->getClosure());
+
+var_dump(function ($someThing) {});
+
+?>
+--EXPECT--
+object(Closure)#2 (1) {
+ ["parameter"]=>
+ array(1) {
+ ["$number"]=>
+ string(10) "<required>"
+ }
+}
+object(Closure)#2 (1) {
+ ["parameter"]=>
+ array(1) {
+ ["$someThing"]=>
+ string(10) "<required>"
+ }
+}
+
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 0176f5b..da42d03 100644
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -414,6 +414,7 @@ static HashTable *zend_closure_get_debug_info(zval *object, int *is_temp) /* {{{
zval val;
struct _zend_arg_info *arg_info = closure->func.common.arg_info;
HashTable *debug_info;
+ zend_bool zstr_args = (closure->func.type == ZEND_USER_FUNCTION) ||
(closure->func.common.fn_flags & ZEND_ACC_USER_ARG_INFO);
*is_temp = 1;
@@ -446,9 +447,15 @@ static HashTable *zend_closure_get_debug_info(zval *object, int *is_temp) /*
{{{
zend_string *name;
zval info;
if (arg_info->name) {
- name = zend_strpprintf(0, "%s$%s",
- arg_info->pass_by_reference ? "&" : "",
- ZSTR_VAL(arg_info->name));
+ if (zstr_args) {
+ name = zend_strpprintf(0, "%s$%s",
+ arg_info->pass_by_reference ? "&" : "",
+ ZSTR_VAL(arg_info->name));
+ } else {
+ name = zend_strpprintf(0, "%s$%s",
+ arg_info->pass_by_reference ? "&" : "",
+ ((zend_internal_arg_info*)arg_info)->name);
+ }
} else {
name = zend_strpprintf(0, "%s$param%d",
arg_info->pass_by_reference ? "&" : "",