diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-11-16 17:09:32 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-11-16 17:09:32 +0300 |
| commit | ccc12b82da5dd10b44ab067b68b762298a9eb4eb (patch) | |
| tree | 9b17d9d3f99f518fe44532c55ac255c3e0134a13 /Zend/zend_operators.c | |
| parent | ce18738a30b3d7f20b392c9167aa251c009a0c21 (diff) | |
| download | php-git-ccc12b82da5dd10b44ab067b68b762298a9eb4eb.tar.gz | |
Avoid unnecessary reference-counting on strings.
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index dcbe40f92c..f3d78c19bc 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1809,8 +1809,9 @@ ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) / ZEND_API int ZEND_FASTCALL string_compare_function_ex(zval *op1, zval *op2, zend_bool case_insensitive) /* {{{ */ { - zend_string *str1 = zval_get_string(op1); - zend_string *str2 = zval_get_string(op2); + zend_string *tmp_str1, *tmp_str2; + zend_string *str1 = zval_get_tmp_string(op1, &tmp_str1); + zend_string *str2 = zval_get_tmp_string(op2, &tmp_str2); int ret; if (case_insensitive) { @@ -1819,8 +1820,8 @@ ZEND_API int ZEND_FASTCALL string_compare_function_ex(zval *op1, zval *op2, zend ret = zend_binary_strcmp(ZSTR_VAL(str1), ZSTR_LEN(str1), ZSTR_VAL(str2), ZSTR_LEN(str2)); } - zend_string_release(str1); - zend_string_release(str2); + zend_tmp_string_release(tmp_str1); + zend_tmp_string_release(tmp_str2); return ret; } /* }}} */ @@ -1835,12 +1836,13 @@ ZEND_API int ZEND_FASTCALL string_compare_function(zval *op1, zval *op2) /* {{{ return zend_binary_strcmp(Z_STRVAL_P(op1), Z_STRLEN_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op2)); } } else { - zend_string *str1 = zval_get_string(op1); - zend_string *str2 = zval_get_string(op2); + zend_string *tmp_str1, *tmp_str2; + zend_string *str1 = zval_get_tmp_string(op1, &tmp_str1); + zend_string *str2 = zval_get_tmp_string(op2, &tmp_str2); int ret = zend_binary_strcmp(ZSTR_VAL(str1), ZSTR_LEN(str1), ZSTR_VAL(str2), ZSTR_LEN(str2)); - zend_string_release(str1); - zend_string_release(str2); + zend_tmp_string_release(tmp_str1); + zend_tmp_string_release(tmp_str2); return ret; } } @@ -1856,12 +1858,13 @@ ZEND_API int ZEND_FASTCALL string_case_compare_function(zval *op1, zval *op2) /* return zend_binary_strcasecmp_l(Z_STRVAL_P(op1), Z_STRLEN_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op2)); } } else { - zend_string *str1 = zval_get_string(op1); - zend_string *str2 = zval_get_string(op2); + zend_string *tmp_str1, *tmp_str2; + zend_string *str1 = zval_get_tmp_string(op1, &tmp_str1); + zend_string *str2 = zval_get_tmp_string(op2, &tmp_str2); int ret = zend_binary_strcasecmp_l(ZSTR_VAL(str1), ZSTR_LEN(str1), ZSTR_VAL(str2), ZSTR_LEN(str1)); - zend_string_release(str1); - zend_string_release(str2); + zend_tmp_string_release(tmp_str1); + zend_tmp_string_release(tmp_str2); return ret; } } @@ -1870,12 +1873,13 @@ ZEND_API int ZEND_FASTCALL string_case_compare_function(zval *op1, zval *op2) /* #if HAVE_STRCOLL ZEND_API int ZEND_FASTCALL string_locale_compare_function(zval *op1, zval *op2) /* {{{ */ { - zend_string *str1 = zval_get_string(op1); - zend_string *str2 = zval_get_string(op2); + zend_string *tmp_str1, *tmp_str2; + zend_string *str1 = zval_get_tmp_string(op1, &tmp_str1); + zend_string *str2 = zval_get_tmp_string(op2, &tmp_str2); int ret = strcoll(ZSTR_VAL(str1), ZSTR_VAL(str2)); - zend_string_release(str1); - zend_string_release(str2); + zend_tmp_string_release(tmp_str1); + zend_tmp_string_release(tmp_str2); return ret; } /* }}} */ |