diff options
| author | Anatol Belski <ab@php.net> | 2016-11-22 02:52:23 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-22 02:52:23 +0100 |
| commit | 0da08fe5952afa6039015d51d6646515bde0b972 (patch) | |
| tree | e5fe3cd339b3f9e631ba59431e12644683c20dea | |
| parent | b52fa5882a276c9397d108cd690721a006acd827 (diff) | |
| download | php-git-0da08fe5952afa6039015d51d6646515bde0b972.tar.gz | |
Revert "fix invalid read, follow up on 97b65cc9"
This reverts commit b52fa5882a276c9397d108cd690721a006acd827.
| -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 458808eb85..5e38defb15 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); - } } /* }}} */ |