mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix invalid read, follow up on 97b65cc9"

Browse Source 
This reverts commit b52fa5882a.
This commit is contained in:
Anatol Belski 2016-11-22 02:52:23 +01:00
parent b52fa5882a
commit 0da08fe595
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/zend_ini_parser.y
View File

@ -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);
}
}
/* }}} */