com php-src: Improved previously fix a little: Zend/zend_ini _parser.y

From: Date: Sat, 21 Nov 2015 16:48:41 +0000
Subject: com php-src: Improved previously fix a little: Zend/zend_ini _parser.y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89954@lists.php.net to get a copy of this message
Commit: e4d1ac2c0f9dd0ac0789fe6afff0e3f97dae3bc6 Author: Xinchen Hui <laruence@gmail.com> Fri, 20 Nov 2015 06:54:57 -0800 Committer: Anatol Belski <ab@php.net> Sat, 21 Nov 2015 17:48:41 +0100 Parents: 855cf743abc1c3721db2e54c74faa6d8518bbc1b Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e4d1ac2c0f9dd0ac0789fe6afff0e3f97dae3bc6 Log: Improved previously fix a little Changed paths: M Zend/zend_ini_parser.y Diff: diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index d6f3315..015a2d6 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -106,21 +106,19 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) if (Z_TYPE_P(op1) != IS_STRING) { zend_string *str = zval_get_string(op1); - ZVAL_PSTRINGL(op1, str->val, str->len); + /* ZEND_ASSERT(!Z_REFCOUNTED_P(op1)); */ + ZVAL_PSTRINGL(op1, ZSTR_VAL(str), ZSTR_LEN(str)); zend_string_release(str); } op1_len = (int)Z_STRLEN_P(op1); if (Z_TYPE_P(op2) != IS_STRING) { - zend_string *str = zval_get_string(op2); - ZVAL_PSTRINGL(op2, str->val, str->len); - zend_string_release(str); + convert_to_string(op2); } 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)); - Z_STRVAL_P(result)[length] = 0; + memcpy(Z_STRVAL_P(result) + op1_len, Z_STRVAL_P(op2), Z_STRLEN_P(op2) + 1); } /* }}} */

« previous php.cvs (#89954) next »