From 9fb62f33822a40eb9e9b3d7cd73509a05e8ba6f8 Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@php.net>
Date: Tue, 23 Aug 2011 10:18:48 +0000
Subject: [PATCH] Sync r314808 to 5_3 branch Eliminated compiler warnings
 "comparison is always false",  "cast to pointer from integer of different
 siz" and tail zero warnings

---
 ext/ereg/ereg.c               | 3 ++-
 ext/ereg/regex/regerror.c     | 8 +++++---
 ext/mysqlnd/mysqlnd_charset.c | 4 ++--
 ext/standard/var.c            | 6 +++---
 main/streams/cast.c           | 2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 475783aa42..b89730221c 100644
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -475,6 +475,7 @@ PHPAPI char *php_ereg_replace(const char *pattern, const char *replace, const ch
 				buf_len = 1 + buf_len + 2 * new_l;
 				nbuf = emalloc(buf_len);
 				strncpy(nbuf, buf, buf_len-1);
+				nbuf[buf_len - 1] = '\0';
 				efree(buf);
 				buf = nbuf;
 			}
@@ -486,7 +487,7 @@ PHPAPI char *php_ereg_replace(const char *pattern, const char *replace, const ch
 			walkbuf = &buf[tmp + subs[0].rm_so];
 			walk = replace;
 			while (*walk) {
-				if ('\\' == *walk && isdigit(walk[1]) && walk[1] - '0' <= (int)re.re_nsub) {
+				if ('\\' == *walk && isdigit((unsigned char)walk[1]) && ((unsigned char)walk[1]) - '0' <= (int)re.re_nsub) {
 					if (subs[walk[1] - '0'].rm_so > -1 && subs[walk[1] - '0'].rm_eo > -1
 						/* this next case shouldn't happen. it does. */
 						&& subs[walk[1] - '0'].rm_so <= subs[walk[1] - '0'].rm_eo) {
diff --git a/ext/ereg/regex/regerror.c b/ext/ereg/regex/regerror.c
index 1c66d4114e..7bf741967d 100644
--- a/ext/ereg/regex/regerror.c
+++ b/ext/ereg/regex/regerror.c
@@ -82,10 +82,12 @@ size_t errbuf_size)
 				break;
 	
 		if (errcode&REG_ITOA) {
-			if (r->code >= 0)
-				(void) strncpy(convbuf, r->name, 50);
-			else
+			if (r->code >= 0) {
+				(void) strncpy(convbuf, r->name, sizeof(convbuf) - 1);
+				convbuf[sizeof(convbuf) - 1] = '\0';
+			} else {
 				snprintf(convbuf, sizeof(convbuf), "REG_0x%x", target);
+			}
 			assert(strlen(convbuf) < sizeof(convbuf));
 			s = convbuf;
 		} else
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
index 6c8e7a5cc1..191fd4ceb4 100644
--- a/ext/mysqlnd/mysqlnd_charset.c
+++ b/ext/mysqlnd/mysqlnd_charset.c
@@ -125,8 +125,8 @@ static unsigned int check_mb_utf8_sequence(const char *start, const char *end)
 		if (!((start[1] ^ 0x80) < 0x40 &&
 			(start[2] ^ 0x80) < 0x40 &&
 			(start[3] ^ 0x80) < 0x40 &&
-				(c >= 0xf1 || start[1] >= 0x90) &&
-				(c <= 0xf3 || start[1] <= 0x8F)))
+				(c >= 0xf1 || start[1] >= (char)0x90) &&
+				(c <= 0xf3 || start[1] <= (char)0x8F)))
 		{
 			return 0;	/* invalid utf8 character */
 		}
diff --git a/ext/standard/var.c b/ext/standard/var.c
index 63e3947b92..ad958b1801 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -598,7 +598,7 @@ static inline zend_bool php_var_serialize_class_name(smart_str *buf, zval *struc
 
 	PHP_SET_CLASS_ATTRIBUTES(struc);
 	smart_str_appendl(buf, "O:", 2);
-	smart_str_append_long(buf, (long)name_len);
+	smart_str_append_long(buf, (int)name_len);
 	smart_str_appendl(buf, ":\"", 2);
 	smart_str_appendl(buf, class_name, name_len);
 	smart_str_appendl(buf, "\":", 2);
@@ -764,12 +764,12 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, HashTable *var
 
 					if (ce->serialize(struc, &serialized_data, &serialized_length, (zend_serialize_data *)var_hash TSRMLS_CC) == SUCCESS) {
 						smart_str_appendl(buf, "C:", 2);
-						smart_str_append_long(buf, (long)Z_OBJCE_P(struc)->name_length);
+						smart_str_append_long(buf, (int)Z_OBJCE_P(struc)->name_length);
 						smart_str_appendl(buf, ":\"", 2);
 						smart_str_appendl(buf, Z_OBJCE_P(struc)->name, Z_OBJCE_P(struc)->name_length);
 						smart_str_appendl(buf, "\":", 2);
 
-						smart_str_append_long(buf, (long)serialized_length);
+						smart_str_append_long(buf, (int)serialized_length);
 						smart_str_appendl(buf, ":{", 2);
 						smart_str_appendl(buf, serialized_data, serialized_length);
 						smart_str_appendc(buf, '}');
diff --git a/main/streams/cast.c b/main/streams/cast.c
index debbd82707..38eb1a987c 100644
--- a/main/streams/cast.c
+++ b/main/streams/cast.c
@@ -271,7 +271,7 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
 
 			newstream = php_stream_fopen_tmpfile();
 			if (newstream) {
-				int retval = php_stream_copy_to_stream_ex(stream, newstream, PHP_STREAM_COPY_ALL, NULL);
+				size_t retval = php_stream_copy_to_stream_ex(stream, newstream, PHP_STREAM_COPY_ALL, NULL);
 
 				if (ret != SUCCESS) {
 					php_stream_close(newstream);
-- 
2.50.1