com php-src: fix bitwise object operations: Zend/zend_operato rs.c
| From: | Bob Weinand | Date: | Thu, 04 Jun 2015 14:09:22 +0000 |
| Subject: | com php-src: fix bitwise object operations: Zend/zend_operato rs.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87064@lists.php.net to get a copy of this message | ||
Commit: 9ca564d5f35855333b1fd59d5212f4de478fce09
Author: Bob Weinand <bobwei9@hotmail.com> Thu, 4 Jun 2015 16:09:22 +0200
Parents: c6db18f9ab0f512df573bca9538f1aace9a1a6d2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ca564d5f35855333b1fd59d5212f4de478fce09
Log:
fix bitwise object operations
Changed paths:
M Zend/zend_operators.c
Diff:
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index dc02c03..aa20bca 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1391,7 +1391,7 @@ ZEND_API int ZEND_FASTCALL bitwise_and_function(zval *result, zval *op1, zval
*o
}
if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) {
- ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_BW_AND, bitwise_or_function);
+ ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_BW_AND, bitwise_and_function);
op1_lval = _zval_get_long_func(op1);
} else {
op1_lval = Z_LVAL_P(op1);
@@ -1458,7 +1458,7 @@ ZEND_API int ZEND_FASTCALL bitwise_xor_function(zval *result, zval *op1, zval
*o
}
if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) {
- ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_BW_XOR, bitwise_or_function);
+ ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_BW_XOR, bitwise_xor_function);
op1_lval = _zval_get_long_func(op1);
} else {
op1_lval = Z_LVAL_P(op1);