]> granicus.if.org Git - php/commitdiff
fix bitwise object operations
authorBob Weinand <bobwei9@hotmail.com>
Thu, 4 Jun 2015 14:09:22 +0000 (16:09 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Thu, 4 Jun 2015 14:09:22 +0000 (16:09 +0200)
Zend/zend_operators.c

index dc02c03899f7ade443db41388864019320bda5e3..aa20bcaf59170476b4b4e4d80a1ad4efbd479e2d 100644 (file)
@@ -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);