jani Sun Aug 31 00:19:50 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c
/php-src/ext/standard/tests/file parse_ini_file_error.phpt
/php-src/ext/standard/tests/general_functions
parse_ini_file-win32.phpt
parse_ini_file.phpt
Log:
MFH:- Fixed bug #45956 (parse_ini_file() does not return false with syntax
errors in parsed file)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.62&r2=1.725.2.31.2.64.2.63&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.62
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.63
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.62 Sat Aug 23
19:22:08 2008
+++ php-src/ext/standard/basic_functions.c Sun Aug 31 00:19:50 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.62 2008/08/23 19:22:08 pajoye
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.63 2008/08/31 00:19:50 jani Exp
$ */
#include "php.h"
#include "php_streams.h"
@@ -6359,7 +6359,11 @@
fh.type = ZEND_HANDLE_FILENAME;
array_init(return_value);
- zend_parse_ini_file(&fh, 0, scanner_mode, ini_parser_cb, return_value
TSRMLS_CC);
+ if (zend_parse_ini_file(&fh, 0, scanner_mode, ini_parser_cb,
return_value TSRMLS_CC) == FAILURE) {
+ zend_hash_destroy(Z_ARRVAL_P(return_value));
+ efree(Z_ARRVAL_P(return_value));
+ RETURN_FALSE;
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_error.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/file/parse_ini_file_error.phpt
diff -u php-src/ext/standard/tests/file/parse_ini_file_error.phpt:1.1.4.2
php-src/ext/standard/tests/file/parse_ini_file_error.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/parse_ini_file_error.phpt:1.1.4.2 Wed Mar
19 17:25:47 2008
+++ php-src/ext/standard/tests/file/parse_ini_file_error.phpt Sun Aug 31
00:19:50 2008
@@ -42,12 +42,10 @@
-- Testing parse_ini_file() function with more than expected no. of arguments
--
Warning: parse_ini_file(%s): failed to open stream: No such file or directory
in %s on line %d
-array(0) {
-}
+bool(false)
-- Testing parse_ini_file() function with a non-existent file --
Warning: parse_ini_file(%s): failed to open stream: No such file or directory
in %s on line %d
-array(0) {
-}
+bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_file-win32.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_file-win32.phpt
diff -u
php-src/ext/standard/tests/general_functions/parse_ini_file-win32.phpt:1.1.2.2
php-src/ext/standard/tests/general_functions/parse_ini_file-win32.phpt:1.1.2.3
---
php-src/ext/standard/tests/general_functions/parse_ini_file-win32.phpt:1.1.2.2
Thu Aug 21 13:05:10 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_file-win32.phpt
Sun Aug 31 00:19:50 2008
@@ -116,12 +116,10 @@
bool(false)
Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such
file or directory in %s.php on line 8
-array(0) {
-}
+bool(false)
Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such
file or directory in %s.php on line 9
-array(0) {
-}
+bool(false)
array(1) {
["test"]=>
string(0) ""
@@ -129,17 +127,11 @@
Warning: parse error in %s on line %d
in %s on line 20
-array(1) {
- ["test"]=>
- string(0) ""
-}
+bool(false)
Warning: parse error in %s on line %d
in %s on line 26
-array(1) {
- ["test"]=>
- string(4) "test"
-}
+bool(false)
array(1) {
["test"]=>
string(8) "new
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_file.phpt?r1=1.1.2.2.2.4&r2=1.1.2.2.2.5&diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_file.phpt
diff -u
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.4
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.5
---
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1.2.2.2.4
Thu Aug 21 13:05:10 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_file.phpt Sun Aug
31 00:19:50 2008
@@ -116,12 +116,10 @@
bool(false)
Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such
file or directory in %sparse_ini_file.php on line 8
-array(0) {
-}
+bool(false)
Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such
file or directory in %sparse_ini_file.php on line 9
-array(0) {
-}
+bool(false)
array(1) {
["test"]=>
string(0) ""
@@ -129,17 +127,11 @@
Warning: syntax error, unexpected '=' in %sparse_ini_file.dat on line 2
in %sparse_ini_file.php on line 20
-array(1) {
- ["test"]=>
- string(0) ""
-}
+bool(false)
Warning: syntax error, unexpected '=' in %sparse_ini_file.dat on line 2
in %sparse_ini_file.php on line 26
-array(1) {
- ["test"]=>
- string(4) "test"
-}
+bool(false)
array(1) {
["test"]=>
string(8) "new
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
