Skip to content

Commit 9b6f1fe

Browse files
committed
Use zend_string API functions
1 parent 7edcfd5 commit 9b6f1fe

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

Zend/zend_operators.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2528,13 +2528,10 @@ static bool ZEND_FASTCALL increment_string(zval *str) /* {{{ */
25282528

25292529
if (UNEXPECTED(!zend_string_only_has_ascii_alphanumeric(Z_STR_P(str)))) {
25302530
zend_string *zstr = Z_STR_P(str);
2531-
GC_TRY_ADDREF(zstr);
2531+
zend_string_addref(zstr);
25322532
zend_error(E_DEPRECATED, "Increment on non-alphanumeric string is deprecated");
25332533
if (EG(exception)) {
2534-
GC_TRY_DELREF(zstr);
2535-
if (!GC_REFCOUNT(zstr)) {
2536-
efree(zstr);
2537-
}
2534+
zend_string_release(zstr);
25382535
return false;
25392536
}
25402537
zval_ptr_dtor(str);
@@ -2740,13 +2737,10 @@ ZEND_API zend_result ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
27402737
default: {
27412738
/* Error handler can unset the variable */
27422739
zend_string *zstr = Z_STR_P(op1);
2743-
GC_TRY_ADDREF(zstr);
2740+
zend_string_addref(zstr);
27442741
zend_error(E_DEPRECATED, "Decrement on non-numeric string has no effect and is deprecated");
27452742
if (EG(exception)) {
2746-
GC_TRY_DELREF(zstr);
2747-
if (!GC_REFCOUNT(zstr)) {
2748-
efree(zstr);
2749-
}
2743+
zend_string_release(zstr);
27502744
return FAILURE;
27512745
}
27522746
zval_ptr_dtor(op1);

0 commit comments

Comments
 (0)