diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2015-08-15 16:29:12 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2015-08-15 16:49:30 +0800 |
| commit | 0bd7d7a3691cee4e916d1008500cf21b80e03056 (patch) | |
| tree | 3060ccc058447c56c4e42dfbefad42e2a4311552 /Zend/zend_ini_parser.y | |
| parent | c63b50557318132723494d945ae284f517ab2e16 (diff) | |
| parent | b0c5439b5f1874070b1baae2dd4c70530b724da1 (diff) | |
| download | php-git-0bd7d7a3691cee4e916d1008500cf21b80e03056.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS for #70157
Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
Diffstat (limited to 'Zend/zend_ini_parser.y')
| -rw-r--r-- | Zend/zend_ini_parser.y | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index 565d83eef8..2bcebe8a03 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -102,8 +102,16 @@ static void zend_ini_init_string(zval *result) */ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) { - int op1_len = (int)Z_STRLEN_P(op1); - int length = op1_len + (int)Z_STRLEN_P(op2); + int length, op1_len; + + if (Z_TYPE_P(op1) != IS_STRING) { + zend_string *str = zval_get_string(op1); + ZVAL_PSTRINGL(op1, str->val, str->len); + zend_string_release(str); + } + + op1_len = (int)Z_STRLEN_P(op1); + length = op1_len + (int)Z_STRLEN_P(op2); ZVAL_NEW_STR(result, zend_string_extend(Z_STR_P(op1), length, 1)); memcpy(Z_STRVAL_P(result)+op1_len, Z_STRVAL_P(op2), Z_STRLEN_P(op2)); @@ -300,7 +308,11 @@ statement: #endif ZEND_INI_PARSER_CB(&$1, &$5, &$2, ZEND_INI_PARSER_POP_ENTRY, ZEND_INI_PARSER_ARG); zend_string_release(Z_STR($1)); - zend_string_release(Z_STR($2)); + if (Z_TYPE($2) == IS_STRING) { + zend_string_release(Z_STR($2)); + } else { + zval_dtor(&$2); + } zval_ptr_dtor(&$5); } | TC_LABEL { ZEND_INI_PARSER_CB(&$1, NULL, NULL, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG); zend_string_release(Z_STR($1)); } |