[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ info.c

[Jani Taskinen]

jani                                     Wed, 17 Nov 2010 11:56:48 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=305453

Log:
- Fixed wrong type causing crash (in php-cgi -i and phpinfo(); when doing HTML 
output)

Changed paths:
    U   php/php-src/trunk/ext/standard/info.c

Modified: php/php-src/trunk/ext/standard/info.c
===================================================================
--- php/php-src/trunk/ext/standard/info.c       2010-11-17 11:55:37 UTC (rev 
305452)
+++ php/php-src/trunk/ext/standard/info.c       2010-11-17 11:56:48 UTC (rev 
305453)
@@ -73,7 +73,8 @@

 static int php_info_print_html_esc(const char *str, int len) /* {{{ */
 {
-       int new_len, written;
+       size_t new_len;
+       int written;
        char *new_str;
        TSRMLS_FETCH();

@@ -299,7 +300,7 @@
  */
 PHPAPI char *php_info_html_esc(char *string TSRMLS_DC)
 {
-       int new_len;
+       size_t new_len;
        return php_escape_html_entities(string, strlen(string), &new_len, 0, 
ENT_QUOTES, NULL TSRMLS_CC);
 }
 /* }}} */
@@ -880,13 +881,13 @@
                if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", 
sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE) {
                        php_info_print_table_row(2, "PHP_AUTH_PW", 
Z_STRVAL_PP(data));
                }
-               php_print_gpcse_array("_REQUEST", sizeof("_REQUEST")-1 
TSRMLS_CC);
-               php_print_gpcse_array("_GET", sizeof("_GET")-1 TSRMLS_CC);
-               php_print_gpcse_array("_POST", sizeof("_POST")-1 TSRMLS_CC);
-               php_print_gpcse_array("_FILES", sizeof("_FILES")-1 TSRMLS_CC);
-               php_print_gpcse_array("_COOKIE", sizeof("_COOKIE")-1 TSRMLS_CC);
-               php_print_gpcse_array("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC);
-               php_print_gpcse_array("_ENV", sizeof("_ENV")-1 TSRMLS_CC);
+               php_print_gpcse_array(ZEND_STRL("_REQUEST") TSRMLS_CC);
+               php_print_gpcse_array(ZEND_STRL("_GET") TSRMLS_CC);
+               php_print_gpcse_array(ZEND_STRL("_POST") TSRMLS_CC);
+               php_print_gpcse_array(ZEND_STRL("_FILES") TSRMLS_CC);
+               php_print_gpcse_array(ZEND_STRL("_COOKIE") TSRMLS_CC);
+               php_print_gpcse_array(ZEND_STRL("_SERVER") TSRMLS_CC);
+               php_print_gpcse_array(ZEND_STRL("_ENV") TSRMLS_CC);
                php_info_print_table_end();
        }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php