com php-src: Fixed parse_ini_file: Zend/zend_ini_pa rser.y ext/standard/basic_functions.c
| From: | Dmitry Stogov | Date: | Sun, 09 Mar 2014 03:35:20 +0000 |
| Subject: | com php-src: Fixed parse_ini_file: Zend/zend_ini_pa rser.y ext/standard/basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77674@lists.php.net to get a copy of this message | ||
Commit: f1ed4f6bf9cc958b6f78cf997c81ec24e7da117f
Author: Xinchen Hui <laruence@gmail.com> Sun, 9 Mar 2014 11:35:20 +0800
Parents: 7668f7f95a84af1ac0d5200eb591794e47c2b13e
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f1ed4f6bf9cc958b6f78cf997c81ec24e7da117f
Log:
Fixed parse_ini_file
Changed paths:
M Zend/zend_ini_parser.y
M ext/standard/basic_functions.c
Diff:
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 268f21b..e9bebf1 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -136,7 +136,7 @@ static void zend_ini_get_var(zval *result, zval *name TSRMLS_DC)
char *envvar;
/* Fetch configuration option value */
- if (zend_get_configuration_directive(Z_STRVAL_P(name), Z_STRLEN_P(name)+1, &curval) ==
SUCCESS) {
+ if (zend_get_configuration_directive(Z_STRVAL_P(name), Z_STRLEN_P(name), &curval) == SUCCESS)
{
ZVAL_PSTRINGL(result, Z_STRVAL(curval), Z_STRLEN(curval));
/* ..or if not found, try ENV */
} else if ((envvar = zend_getenv(Z_STRVAL_P(name), Z_STRLEN_P(name) TSRMLS_CC)) != NULL ||
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 499aa82..d666c02 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -5906,33 +5906,27 @@ static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int
cal
ulong key = (ulong) zend_atol(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1));
if ((find_hash = zend_hash_index_find(Z_ARRVAL_P(arr), key)) == NULL) {
array_init(&hash);
-
- zend_hash_index_update(Z_ARRVAL_P(arr), key, &hash);
- } else {
- ZVAL_COPY_VALUE(&hash, find_hash);
- }
+ find_hash = zend_hash_index_update(Z_ARRVAL_P(arr), key, &hash);
+ }
} else {
if ((find_hash = zend_hash_find(Z_ARRVAL_P(arr), Z_STR_P(arg1))) == NULL) {
array_init(&hash);
-
- zend_hash_update(Z_ARRVAL_P(arr), Z_STR_P(arg1), &hash);
- } else {
- ZVAL_COPY_VALUE(&hash, find_hash);
- }
+ find_hash = zend_hash_update(Z_ARRVAL_P(arr), Z_STR_P(arg1), &hash);
+ }
}
- if (Z_TYPE(hash) != IS_ARRAY) {
- zval_dtor(&hash);
- array_init(&hash);
+ if (Z_TYPE_P(find_hash) != IS_ARRAY) {
+ zval_dtor(find_hash);
+ array_init(find_hash);
}
ZVAL_DUP(&element, arg2);
if (arg3 && Z_STRLEN_P(arg3) > 0) {
//???
- add_assoc_zval_ex(&hash, Z_STRVAL_P(arg3), Z_STRLEN_P(arg3), &element);
+ add_assoc_zval_ex(find_hash, Z_STRVAL_P(arg3), Z_STRLEN_P(arg3), &element);
} else {
- add_next_index_zval(&hash, &element);
+ add_next_index_zval(find_hash, &element);
}
}
break;