summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/zend_operators.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 897d807020..fa7995e991 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -871,7 +871,7 @@ ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
result_str[i] |= shorter->value.str.val[i];
}
if (result==op1) {
- efree(result->value.str.val);
+ STR_FREE(result->value.str.val);
}
result->value.str.val = result_str;
result->value.str.len = result_len;
@@ -910,7 +910,7 @@ ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
result_str[i] &= longer->value.str.val[i];
}
if (result==op1) {
- efree(result->value.str.val);
+ STR_FREE(result->value.str.val);
}
result->value.str.val = result_str;
result->value.str.len = result_len;
@@ -951,7 +951,7 @@ ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
result_str[i] ^= longer->value.str.val[i];
}
if (result==op1) {
- efree(result->value.str.val);
+ STR_FREE(result->value.str.val);
}
result->value.str.val = result_str;
result->value.str.len = result_len;
@@ -1489,12 +1489,12 @@ ZEND_API int increment_function(zval *op1)
op1->value.lval = lval+1;
op1->type = IS_LONG;
}
- efree(strval);
+ efree(strval); /* should never be empty_string */
break;
case IS_DOUBLE:
op1->value.dval = dval+1;
op1->type = IS_DOUBLE;
- efree(strval);
+ efree(strval); /* should never be empty_string */
break;
#if 0
case FLAG_IS_BC: