felipe Wed, 26 May 2010 02:18:17 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=299767
Log: - Fixed bug #51899 (Parse error in parse_ini_file() function when empy value followed by no newline) Bug: http://bugs.php.net/51899 (Closed) Parse error in parse_ini_file() function when empy value followed by no newline Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c U php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l U php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h A php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51899.phpt U php/php-src/trunk/Zend/zend_ini_scanner.c U php/php-src/trunk/Zend/zend_ini_scanner.l U php/php-src/trunk/Zend/zend_ini_scanner_defs.h A php/php-src/trunk/ext/standard/tests/strings/bug51899.phpt Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-05-26 00:00:58 UTC (rev 299766) +++ php/php-src/branches/PHP_5_3/NEWS 2010-05-26 02:18:17 UTC (rev 299767) @@ -66,6 +66,8 @@ constant array). (Felipe) - Fixed bug #51905 (ReflectionParameter fails if default value is an array with an access to self::). (Felipe) +- Fixed bug #51899 (Parse error in parse_ini_file() function when empy value + followed by no newline). (Felipe) - Fixed bug #51844 (checkdnsrr does not support types other than MX). (Pierre) - Fixed bug #51827 (Bad warning when register_shutdown_function called with wrong num of parameters). (Felipe) Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c =================================================================== --- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c 2010-05-26 00:00:58 UTC (rev 299766) +++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c 2010-05-26 02:18:17 UTC (rev 299767) @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Sun Feb 7 13:25:37 2010 */ +/* Generated by re2c 0.13.5 on Tue May 25 22:53:58 2010 */ #line 1 "Zend/zend_ini_scanner.l" /* +----------------------------------------------------------------------+ @@ -317,7 +317,7 @@ if (YYCURSOR >= YYLIMIT) { if (YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW)) { BEGIN(INITIAL); - return 0; + return END_OF_LINE; } return 0; } Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l =================================================================== --- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l 2010-05-26 00:00:58 UTC (rev 299766) +++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l 2010-05-26 02:18:17 UTC (rev 299767) @@ -315,7 +315,7 @@ if (YYCURSOR >= YYLIMIT) { if (YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW)) { BEGIN(INITIAL); - return 0; + return END_OF_LINE; } return 0; } Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h =================================================================== --- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h 2010-05-26 00:00:58 UTC (rev 299766) +++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h 2010-05-26 02:18:17 UTC (rev 299767) @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Sun Feb 7 13:25:37 2010 */ +/* Generated by re2c 0.13.5 on Tue May 25 22:53:58 2010 */ #line 3 "Zend/zend_ini_scanner_defs.h" enum YYCONDTYPE { Added: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51899.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51899.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51899.phpt 2010-05-26 02:18:17 UTC (rev 299767) @@ -0,0 +1,37 @@ +--TEST-- +Bug #51899 (Parse error in parse_ini_file() function when empy value followed by no newline) +--FILE-- +<?php + +var_dump(parse_ini_string('a=')); +var_dump(parse_ini_string('a= ')); +var_dump(parse_ini_string('a='.PHP_EOL)); +var_dump(parse_ini_string('a=b ')); +var_dump(parse_ini_string('')); +var_dump(parse_ini_string(NULL)); +var_dump(parse_ini_string("\0")); + +?> +--EXPECT-- +array(1) { + ["a"]=> + string(0) "" +} +array(1) { + ["a"]=> + string(0) "" +} +array(1) { + ["a"]=> + string(0) "" +} +array(1) { + ["a"]=> + string(2) "b " +} +array(0) { +} +array(0) { +} +array(0) { +} Property changes on: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51899.phpt ___________________________________________________________________ Added: svn:keywords + Id Rev Revision Added: svn:eol-style + native Modified: php/php-src/trunk/Zend/zend_ini_scanner.c =================================================================== --- php/php-src/trunk/Zend/zend_ini_scanner.c 2010-05-26 00:00:58 UTC (rev 299766) +++ php/php-src/trunk/Zend/zend_ini_scanner.c 2010-05-26 02:18:17 UTC (rev 299767) @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Sun Feb 7 13:25:37 2010 */ +/* Generated by re2c 0.13.5 on Tue May 25 22:53:58 2010 */ #line 1 "Zend/zend_ini_scanner.l" /* +----------------------------------------------------------------------+ @@ -317,7 +317,7 @@ if (YYCURSOR >= YYLIMIT) { if (YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW)) { BEGIN(INITIAL); - return 0; + return END_OF_LINE; } return 0; } Modified: php/php-src/trunk/Zend/zend_ini_scanner.l =================================================================== --- php/php-src/trunk/Zend/zend_ini_scanner.l 2010-05-26 00:00:58 UTC (rev 299766) +++ php/php-src/trunk/Zend/zend_ini_scanner.l 2010-05-26 02:18:17 UTC (rev 299767) @@ -315,7 +315,7 @@ if (YYCURSOR >= YYLIMIT) { if (YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW)) { BEGIN(INITIAL); - return 0; + return END_OF_LINE; } return 0; } Modified: php/php-src/trunk/Zend/zend_ini_scanner_defs.h =================================================================== --- php/php-src/trunk/Zend/zend_ini_scanner_defs.h 2010-05-26 00:00:58 UTC (rev 299766) +++ php/php-src/trunk/Zend/zend_ini_scanner_defs.h 2010-05-26 02:18:17 UTC (rev 299767) @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Sun Feb 7 13:25:37 2010 */ +/* Generated by re2c 0.13.5 on Tue May 25 22:53:58 2010 */ #line 3 "Zend/zend_ini_scanner_defs.h" enum YYCONDTYPE { Added: php/php-src/trunk/ext/standard/tests/strings/bug51899.phpt =================================================================== --- php/php-src/trunk/ext/standard/tests/strings/bug51899.phpt (rev 0) +++ php/php-src/trunk/ext/standard/tests/strings/bug51899.phpt 2010-05-26 02:18:17 UTC (rev 299767) @@ -0,0 +1,37 @@ +--TEST-- +Bug #51899 (Parse error in parse_ini_file() function when empy value followed by no newline) +--FILE-- +<?php + +var_dump(parse_ini_string('a=')); +var_dump(parse_ini_string('a= ')); +var_dump(parse_ini_string('a='.PHP_EOL)); +var_dump(parse_ini_string('a=b ')); +var_dump(parse_ini_string('')); +var_dump(parse_ini_string(NULL)); +var_dump(parse_ini_string("\0")); + +?> +--EXPECT-- +array(1) { + ["a"]=> + string(0) "" +} +array(1) { + ["a"]=> + string(0) "" +} +array(1) { + ["a"]=> + string(0) "" +} +array(1) { + ["a"]=> + string(2) "b " +} +array(0) { +} +array(0) { +} +array(0) { +} Property changes on: php/php-src/trunk/ext/standard/tests/strings/bug51899.phpt ___________________________________________________________________ Added: svn:keywords + Id Rev Revision Added: svn:eol-style + native
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
