1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 08:58:28 +02:00

Fix phpinfo() bug that crept in

This commit is contained in:
Zeev Suraski
2001-03-04 15:49:38 +00:00
parent a22ada795f
commit 1000a86e5f
+6 -7
View File
@@ -60,7 +60,7 @@ static int _display_module_info(zend_module_entry *module, void *arg)
static void php_print_gpcse_array(char *name, uint name_length ELS_DC)
{
zval **data, **tmp, *tmp2;
zval **data, **tmp, tmp2;
char *string_key;
ulong num_key;
@@ -68,7 +68,6 @@ static void php_print_gpcse_array(char *name, uint name_length ELS_DC)
&& ((*data)->type==IS_ARRAY)) {
zend_hash_internal_pointer_reset((*data)->value.ht);
while (zend_hash_get_current_data((*data)->value.ht, (void **) &tmp) == SUCCESS) {
PUTS("<TR VALIGN=\"baseline\" BGCOLOR=\"" PHP_CONTENTS_COLOR "\">");
PUTS("<TD BGCOLOR=\"" PHP_ENTRY_NAME_COLOR "\"><B>");
PUTS(name);
@@ -87,11 +86,11 @@ static void php_print_gpcse_array(char *name, uint name_length ELS_DC)
zend_print_zval_r(*tmp, 0);
PUTS("</PRE>");
} else if ((*tmp)->type != IS_STRING) {
tmp2 = *tmp;
zval_copy_ctor(tmp2);
convert_to_string(tmp2);
PUTS(tmp2->value.str.val);
zval_dtor(tmp2);
tmp2 = **tmp;
zval_copy_ctor(&tmp2);
convert_to_string(&tmp2);
PUTS(&tmp2.value.str.val);
zval_dtor(&tmp2);
} else {
PUTS((*tmp)->value.str.val);
}