Skip to content

Commit 3920344

Browse files
committed
Fixed phpdbg backtrace argument's name missing
1 parent 5f28548 commit 3920344

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

sapi/phpdbg/phpdbg_frame.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,22 @@ static void phpdbg_dump_prototype(zval *tmp) /* {{{ */
142142
}
143143
phpdbg_xml("<arg %r");
144144
if (m && j < m) {
145+
char *arg_name = NULL;
146+
147+
if (arginfo) {
148+
if (func->type == ZEND_INTERNAL_FUNCTION) {
149+
arg_name = (char *)((zend_internal_arg_info *)&arginfo[j])->name;
150+
} else {
151+
arg_name = arginfo[j].name->val;
152+
}
153+
}
154+
145155
if (!is_variadic) {
146156
is_variadic = arginfo ? arginfo[j].is_variadic : 0;
147157
}
148-
phpdbg_xml(" variadic=\"%s\" name=\"%s\">", is_variadic ? "variadic" : "", arginfo ? arginfo[j].name : "");
149-
phpdbg_out("%s=%s", arginfo ? arginfo[j].name : "?", is_variadic ? "[": "");
158+
159+
phpdbg_xml(" variadic=\"%s\" name=\"%s\">", is_variadic ? "variadic" : "", arg_name ? arg_name : "");
160+
phpdbg_out("%s=%s", arg_name ? arg_name : "?", is_variadic ? "[": "");
150161

151162
} else {
152163
phpdbg_xml(">");

0 commit comments

Comments
 (0)