From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 27 Jun 2007 11:04:50 +0000 (+0000)
Subject: Fixed bitwise operations with numeric unicode strings
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~374
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06320d3f5076a4e0f766ad2a5b9e1542d0d5473b;p=php

Fixed bitwise operations with numeric unicode strings
---

diff --git a/Zend/tests/and_001.phpt b/Zend/tests/and_001.phpt
index 109b2ce995..c793828c21 100644
--- a/Zend/tests/and_001.phpt
+++ b/Zend/tests/and_001.phpt
@@ -3,28 +3,28 @@ bitwise AND and strings
 --FILE--
 <?php
 
-$s = "123";
-$s1 = "234";
+$s = b"123";
+$s1 = b"234";
 
 var_dump($s & $s1);
 
-$s = "test";
-$s1 = "some";
+$s = b"test";
+$s1 = b"some";
 
 var_dump($s & $s1);
 
-$s = "test long";
-$s1 = "some";
+$s = b"test long";
+$s1 = b"some";
 
 var_dump($s & $s1);
 
-$s = "test";
-$s1 = "some long";
+$s = b"test";
+$s1 = b"some long";
 
 var_dump($s & $s1);
 
-$s = "test";
-$s &= "some long";
+$s = b"test";
+$s &= b"some long";
 
 var_dump($s);
 
diff --git a/Zend/tests/bug41640.phpt b/Zend/tests/bug41640.phpt
index c859d90850..11ef334f45 100644
--- a/Zend/tests/bug41640.phpt
+++ b/Zend/tests/bug41640.phpt
@@ -13,3 +13,8 @@ array(1) {
   ["x"]=>
   int(1)
 }
+--UEXPECT--
+array(1) {
+  [u"x"]=>
+  int(1)
+}
diff --git a/Zend/tests/not_001.phpt b/Zend/tests/not_001.phpt
index 6eb0f000c9..0a6f0123b9 100644
--- a/Zend/tests/not_001.phpt
+++ b/Zend/tests/not_001.phpt
@@ -5,8 +5,8 @@ bitwise NOT, doubles and strings
 
 $d = 23.67;
 $s = "48484.22";
-$s1 = "test";
-$s2 = "some";
+$s1 = b"test";
+$s2 = b"some";
 
 $s = ~$d;
 var_dump($s);
@@ -20,3 +20,7 @@ echo "Done\n";
 int(-24)
 string(8) "8c90929a"
 Done
+--UEXPECTF--	
+int(-24)
+unicode(8) "8c90929a"
+Done
diff --git a/Zend/tests/or_001.phpt b/Zend/tests/or_001.phpt
index 1e4e5131a5..dbe8da111b 100644
--- a/Zend/tests/or_001.phpt
+++ b/Zend/tests/or_001.phpt
@@ -3,19 +3,19 @@ bitwise OR and strings
 --FILE--
 <?php
 
-$s = "323423";
-$s1 = "2323.555";
+$s = b"323423";
+$s1 = b"2323.555";
 
 var_dump($s | $s1);
 var_dump($s1 | $s);
 
-$s = "some";
-$s1 = "test";
+$s = b"some";
+$s1 = b"test";
 
 var_dump($s | $s1);
 
-$s = "some";
-$s |= "test";
+$s = b"some";
+$s |= b"test";
 
 var_dump($s);
 
diff --git a/Zend/tests/xor_002.phpt b/Zend/tests/xor_002.phpt
index 0cf4054fa4..11e8bc93bd 100644
--- a/Zend/tests/xor_002.phpt
+++ b/Zend/tests/xor_002.phpt
@@ -3,28 +3,28 @@ XORing strings
 --FILE--
 <?php
 
-$s = "123";
-$s1 = "234";
+$s = b"123";
+$s1 = b"234";
 var_dump(bin2hex($s ^ $s1));
 
-$s = "1235";
-$s1 = "234";
+$s = b"1235";
+$s1 = b"234";
 var_dump(bin2hex($s ^ $s1));
 
-$s = "some";
-$s1 = "test";
+$s = b"some";
+$s1 = b"test";
 var_dump(bin2hex($s ^ $s1));
 
-$s = "some long";
-$s1 = "test";
+$s = b"some long";
+$s1 = b"test";
 var_dump(bin2hex($s ^ $s1));
 
-$s = "some";
-$s1 = "test long";
+$s = b"some";
+$s1 = b"test long";
 var_dump(bin2hex($s ^ $s1));
 
-$s = "some";
-$s ^= "test long";
+$s = b"some";
+$s ^= b"test long";
 var_dump(bin2hex($s));
 
 echo "Done\n";
@@ -37,3 +37,11 @@ string(8) "070a1e11"
 string(8) "070a1e11"
 string(8) "070a1e11"
 Done
+--UEXPECTF--	
+unicode(6) "030107"
+unicode(6) "030107"
+unicode(8) "070a1e11"
+unicode(8) "070a1e11"
+unicode(8) "070a1e11"
+unicode(8) "070a1e11"
+Done
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index e245150a62..50ed7b011b 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1499,7 +1499,7 @@ ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 		Z_STRLEN_P(result) = result_len;
 		return SUCCESS;
 	}
-	if (Z_TYPE_P(op1) == IS_UNICODE || Z_TYPE_P(op2) == IS_UNICODE) {
+	if (Z_TYPE_P(op1) == IS_UNICODE && Z_TYPE_P(op2) == IS_UNICODE) {
 		zend_error(E_ERROR, "Unsupported operand types");
 		return FAILURE;
 	}
@@ -1543,7 +1543,7 @@ ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 		return SUCCESS;
 	}
 
-	if (Z_TYPE_P(op1) == IS_UNICODE || Z_TYPE_P(op2) == IS_UNICODE) {
+	if (Z_TYPE_P(op1) == IS_UNICODE && Z_TYPE_P(op2) == IS_UNICODE) {
 		zend_error(E_ERROR, "Unsupported operand types");
 		return FAILURE;
 	}
@@ -1588,7 +1588,7 @@ ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 		return SUCCESS;
 	}
 
-	if (Z_TYPE_P(op1) == IS_UNICODE || Z_TYPE_P(op2) == IS_UNICODE) {
+	if (Z_TYPE_P(op1) == IS_UNICODE && Z_TYPE_P(op2) == IS_UNICODE) {
 		zend_error(E_ERROR, "Unsupported operand types");
 		return FAILURE;
 	}
@@ -1606,11 +1606,6 @@ ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 {
 	zval op1_copy, op2_copy;
 
-	if (Z_TYPE_P(op1) == IS_UNICODE || Z_TYPE_P(op2) == IS_UNICODE) {
-		zend_error(E_ERROR, "Unsupported operand types");
-		return FAILURE;
-	}
-
 	zendi_convert_to_long(op1, op1_copy, result);
 	zendi_convert_to_long(op2, op2_copy, result);
 	Z_LVAL_P(result) = Z_LVAL_P(op1) << Z_LVAL_P(op2);
@@ -1623,11 +1618,6 @@ ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 {
 	zval op1_copy, op2_copy;
 
-	if (Z_TYPE_P(op1) == IS_UNICODE || Z_TYPE_P(op2) == IS_UNICODE) {
-		zend_error(E_ERROR, "Unsupported operand types");
-		return FAILURE;
-	}
-
 	zendi_convert_to_long(op1, op1_copy, result);
 	zendi_convert_to_long(op2, op2_copy, result);
 	Z_LVAL_P(result) = Z_LVAL_P(op1) >> Z_LVAL_P(op2);