From: Reeze Xia <reeze@php.net>
Date: Fri, 13 Feb 2015 06:19:29 +0000 (+0000)
Subject: Fixed phpdbg backtrace argument's name missing
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~164^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39203441ed9335f33f326b4e14473dd0f37cf6d2;p=php

Fixed phpdbg backtrace argument's name missing
---

diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c
index a3531f94af..3384a2c9d1 100644
--- a/sapi/phpdbg/phpdbg_frame.c
+++ b/sapi/phpdbg/phpdbg_frame.c
@@ -142,11 +142,22 @@ static void phpdbg_dump_prototype(zval *tmp) /* {{{ */
 			}
 			phpdbg_xml("<arg %r");
 			if (m && j < m) {
+				char *arg_name = NULL;
+
+				if (arginfo) {
+					if (func->type == ZEND_INTERNAL_FUNCTION) {
+						arg_name = (char *)((zend_internal_arg_info *)&arginfo[j])->name;
+					} else {
+						arg_name = arginfo[j].name->val;
+					}
+				}
+
 				if (!is_variadic) {
 					is_variadic = arginfo ? arginfo[j].is_variadic : 0;
 				}
-				phpdbg_xml(" variadic=\"%s\" name=\"%s\">", is_variadic ? "variadic" : "", arginfo ? arginfo[j].name : "");
-				phpdbg_out("%s=%s", arginfo ? arginfo[j].name : "?", is_variadic ? "[": "");
+
+				phpdbg_xml(" variadic=\"%s\" name=\"%s\">", is_variadic ? "variadic" : "", arg_name ? arg_name : "");
+				phpdbg_out("%s=%s", arg_name ? arg_name : "?", is_variadic ? "[": "");
 
 			} else {
 				phpdbg_xml(">");