svn: /php/php-src/ branches/PHP_5_3/ext/standard/basic_functions.c branches/PHP_5_4/ext/standard/basic_functions.c
trunk/ext/standard/basic_functions.c
| From: | Pierre Joye | Date: | Tue, 06 Sep 2011 17:41:08 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/standard/basic_functions.c branches/PHP_5_4/ext/standard/basic_functions.c trunk/ext/standard/basic_functions.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-66320@lists.php.net to get a copy of this message | ||
pajoye Tue, 06 Sep 2011 17:41:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316285
Log:
- fix #55622, mem corruption on large input
Bug: https://bugs.php.net/55622 (error getting bug
information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
U php/php-src/trunk/ext/standard/basic_functions.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-09-06 17:10:16 UTC (rev 316284)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-09-06 17:41:08 UTC (rev 316285)
@@ -6022,7 +6022,7 @@
PHP_FUNCTION(parse_ini_string)
{
char *string = NULL, *str = NULL;
- int str_len = 0;
+ size_t str_len = 0;
zend_bool process_sections = 0;
long scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_ini_parser_cb_t ini_parser_cb;
Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-09-06 17:10:16 UTC (rev 316284)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-09-06 17:41:08 UTC (rev 316285)
@@ -5903,7 +5903,7 @@
PHP_FUNCTION(parse_ini_string)
{
char *string = NULL, *str = NULL;
- int str_len = 0;
+ size_t str_len = 0;
zend_bool process_sections = 0;
long scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_ini_parser_cb_t ini_parser_cb;
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.c 2011-09-06 17:10:16 UTC (rev 316284)
+++ php/php-src/trunk/ext/standard/basic_functions.c 2011-09-06 17:41:08 UTC (rev 316285)
@@ -5938,7 +5938,7 @@
PHP_FUNCTION(parse_ini_string)
{
char *string = NULL, *str = NULL;
- int str_len = 0;
+ size_t str_len = 0;
zend_bool process_sections = 0;
long scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_ini_parser_cb_t ini_parser_cb;