diff options
| author | Anatol Belski <ab@php.net> | 2016-11-22 02:59:17 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-22 02:59:17 +0100 |
| commit | b10de2f5c2c4a8585960419e04d5c21fe0908c2a (patch) | |
| tree | 91210751718c6a5307aa5f3e64f98f14bb1254f3 /Zend/zend_ini_parser.y | |
| parent | 189df8e7322a6bc3a0f77d74e16d1834d38410d2 (diff) | |
| parent | 0da08fe5952afa6039015d51d6646515bde0b972 (diff) | |
| download | php-git-b10de2f5c2c4a8585960419e04d5c21fe0908c2a.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "fix invalid read, follow up on 97b65cc9"
Diffstat (limited to 'Zend/zend_ini_parser.y')
| -rw-r--r-- | Zend/zend_ini_parser.y | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index ab73f053f5..8caa2931f4 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -109,16 +109,16 @@ static void zend_ini_init_string(zval *result) static void zend_ini_add_string(zval *result, zval *op1, zval *op2) { int length, op1_len; - zend_string *str = NULL; if (Z_TYPE_P(op1) != IS_STRING) { - str = zval_get_string(op1); + zend_string *str = zval_get_string(op1); /* ZEND_ASSERT(!Z_REFCOUNTED_P(op1)); */ if (ZEND_SYSTEM_INI) { ZVAL_PSTRINGL(op1, ZSTR_VAL(str), ZSTR_LEN(str)); } else { ZVAL_STR(op1, str); } + zend_string_release(str); } op1_len = (int)Z_STRLEN_P(op1); @@ -129,10 +129,6 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) ZVAL_NEW_STR(result, zend_string_extend(Z_STR_P(op1), length, ZEND_SYSTEM_INI)); memcpy(Z_STRVAL_P(result) + op1_len, Z_STRVAL_P(op2), Z_STRLEN_P(op2) + 1); - - if (str) { - zend_string_release(str); - } } /* }}} */ |