From: Felipe Pena <felipe@php.net>
Date: Wed, 26 May 2010 02:18:17 +0000 (+0000)
Subject: - Fixed bug #51899 (Parse error in parse_ini_file() function when empy value followed... 
X-Git-Tag: php-5.4.0alpha1~191^2~1426
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de531056f7d002a5b0fea12c1e320e2abe2823c2;p=php

- Fixed bug #51899 (Parse error in parse_ini_file() function when empy value followed by no newline)
---

diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 2499797085..1677d3ed2e 100644
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -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 @@ restart:
 	if (YYCURSOR >= YYLIMIT) {
 		if (YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW)) {
 			BEGIN(INITIAL);
-			return 0;
+			return END_OF_LINE;
 		}
 		return 0;
 	}
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 741dcc0643..1c19a0978d 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -315,7 +315,7 @@ restart:
 	if (YYCURSOR >= YYLIMIT) {
 		if (YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW)) {
 			BEGIN(INITIAL);
-			return 0;
+			return END_OF_LINE;
 		}
 		return 0;
 	}
diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index 1956b6225b..4107238ad3 100644
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -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 {
diff --git a/ext/standard/tests/strings/bug51899.phpt b/ext/standard/tests/strings/bug51899.phpt
new file mode 100644
index 0000000000..fb430cf30d
--- /dev/null
+++ b/ext/standard/tests/strings/bug51899.phpt
@@ -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) {
+}