From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Mon, 5 Sep 2011 00:39:39 +0000 (+0000)
Subject: - Fixed bad xor in signed types due to integer promotion.
X-Git-Tag: php-5.5.0alpha1~1348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=187b419b0473016f149c8f6dc3d8159b24ad9e73;p=php

- Fixed bad xor in signed types due to integer promotion.
- Replaced undefined signed overflow with char -> unsigned char conversion.
---

diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
index a87b2a1f4f..0b7ce08236 100644
--- a/ext/mysqlnd/mysqlnd_charset.c
+++ b/ext/mysqlnd/mysqlnd_charset.c
@@ -123,11 +123,11 @@ static unsigned int check_mb_utf8_sequence(const char *start, const char *end)
 		  [F4][80..8F][80..BF][80..BF]
 		*/
 
-		if (!((start[1] ^ 0x80) < 0x40 &&
-			(start[2] ^ 0x80) < 0x40 &&
-			(start[3] ^ 0x80) < 0x40 &&
-				(c >= 0xf1 || start[1] >= (char)0x90) &&
-				(c <= 0xf3 || start[1] <= (char)0x8F)))
+		if (!(((zend_uchar)start[1] ^ 0x80) < 0x40 &&
+			((zend_uchar)start[2] ^ 0x80) < 0x40 &&
+			((zend_uchar)start[3] ^ 0x80) < 0x40 &&
+				(c >= 0xf1 || (zend_uchar)start[1] >= 0x90) &&
+				(c <= 0xf3 || (zend_uchar)start[1] <= 0x8F)))
 		{
 			return 0;	/* invalid utf8 character */
 		}