From: Bob Weinand <bobwei9@hotmail.com>
Date: Thu, 4 Jun 2015 14:09:22 +0000 (+0200)
Subject: fix bitwise object operations
X-Git-Tag: php-7.0.0alpha1~33^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ca564d5f35855333b1fd59d5212f4de478fce09;p=php

fix bitwise object operations
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index dc02c03899..aa20bcaf59 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);