From: Jani Taskinen <jani@php.net>
Date: Tue, 4 Aug 2009 02:56:26 +0000 (+0000)
Subject: - Fixed bug #48768 (parse_ini_*() crash with INI_SCANNER_RAW)
X-Git-Tag: php-5.4.0alpha1~191^2~2862
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f487836c1a051e08a00a297642eec46506c51076;p=php

- Fixed bug #48768 (parse_ini_*() crash with INI_SCANNER_RAW)
---

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index ac1ac76ac2..b3143a14ad 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -315,7 +315,7 @@ DOLLAR_CURLY "${"
 
 SECTION_RAW_CHARS [^\]\n\r]
 SINGLE_QUOTED_CHARS [^']
-RAW_VALUE_CHARS [^=\n\r;]
+RAW_VALUE_CHARS [^\n\r;]
 
 LITERAL_DOLLAR ("$"([^{\000]|("\\"{ANY_CHAR})))
 VALUE_CHARS         ([^$= \t\n\r;&|~()!"'\000]|{LITERAL_DOLLAR})
diff --git a/ext/standard/tests/general_functions/bug48768.phpt b/ext/standard/tests/general_functions/bug48768.phpt
new file mode 100644
index 0000000000..61293961ed
--- /dev/null
+++ b/ext/standard/tests/general_functions/bug48768.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Bug #48768 (parse_ini_*() crashes with INI_SCANNER_RAW)
+--FILE--
+<?php
+
+$ini_location = dirname(__FILE__) . '/bug48768.tmp';
+
+// Build ini data
+$ini_data = <<< EOT
+equal = "="
+
+EOT;
+
+// Save ini data to file
+file_put_contents($ini_location, $ini_data);
+
+var_dump(parse_ini_file($ini_location, false, INI_SCANNER_RAW));
+var_dump(parse_ini_file($ini_location, false, INI_SCANNER_NORMAL));
+
+?>
+--CLEAN--
+<?php @unlink(dirname(__FILE__) . '/bug48768.tmp'); ?>
+--EXPECT--
+array(1) {
+  [u"equal"]=>
+  unicode(1) "="
+}
+array(1) {
+  [u"equal"]=>
+  unicode(1) "="
+}