From: Andrey Hristov <andrey@php.net>
Date: Tue, 16 Sep 2008 14:34:11 +0000 (+0000)
Subject: Fix a crash introduced yesterday in mysqlnd, non-zts mode - missing if () for
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~372
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7226f1a0394bee4d39873e63f2420cd2eb99d34;p=php

Fix a crash introduced yesterday in mysqlnd, non-zts mode - missing if () for
STAT_LAST was accessing wrong memory thus overwritting method pointers.

Windows doesn't have atoll(), which is C99, C89 has only atoi() + atol().
Win has _atoi64, so use it.
---

diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h
index aef6912a5e..1215a13681 100644
--- a/ext/mysqlnd/mysqlnd_statistics.h
+++ b/ext/mysqlnd/mysqlnd_statistics.h
@@ -62,9 +62,9 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
 #define MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(statistic1, value1, statistic2, value2) \
  { \
  	if (MYSQLND_G(collect_statistics)) { \
-		DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[statistic1], mysqlnd_stats_values_names[statistic2]); \
 		uint64 v1 = (uint64) (value1); \
 		uint64 v2 = (uint64) (value2); \
+		DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[statistic1], mysqlnd_stats_values_names[statistic2]); \
 										\
  		tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
 		if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
@@ -111,8 +111,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
 		if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
 		tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
 		if ((conn_stats)) { \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
+			if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
+			if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
 		} \
 	} \
  }
@@ -164,9 +164,9 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
 #define MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(statistic1, value1, statistic2, value2) \
  { \
  	if (MYSQLND_G(collect_statistics)) { \
-		DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[statistic1], mysqlnd_stats_values_names[statistic2]); \
 		uint64 v1 = (uint64) (value1); \
 		uint64 v2 = (uint64) (value2); \
+		DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[statistic1], mysqlnd_stats_values_names[statistic2]); \
 			\
 		if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
 		if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
@@ -205,8 +205,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
 		if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
 		if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
 		if ((conn_stats)) { \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
+			if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
+			if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
 		} \
 	} \
  }
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 0dc013df41..d5e09a1288 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -1560,10 +1560,20 @@ void php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer,
 				if (perm_bind.pack_len < SIZEOF_LONG)
 				{
 					/* direct conversion */
-					int64 v = atoll((char *) p);
+					int64 v =
+#ifndef PHP_WIN32
+						atoll((char *) p);
+#else
+						_atoi64((char *) p);
+#endif
 					ZVAL_LONG(*current_field, v);
 				} else {
-					uint64 v = (uint64) atoll((char *) p);
+					uint64 v =
+#ifndef PHP_WIN32
+						(uint64) atoll((char *) p);
+#else
+						(uint64) _atoi64((char *) p);
+#endif
 					zend_bool uns = fields_metadata[i].flags & UNSIGNED_FLAG? TRUE:FALSE;
 					/* We have to make it ASCIIZ temporarily */
 #if SIZEOF_LONG==8
@@ -1580,13 +1590,11 @@ void php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer,
 					}
 				}
 				*(p + len) = save;
-			} else if (as_int_or_float && perm_bind.php_type == IS_DOUBLE)
-			{
+			} else if (as_int_or_float && perm_bind.php_type == IS_DOUBLE) {
 				zend_uchar save = *(p + len);
 				/* We have to make it ASCIIZ temporarily */
 				*(p + len) = '\0';
-				double v = atof((char *) p);
-				ZVAL_DOUBLE(*current_field, v);
+				ZVAL_DOUBLE(*current_field, atof((char *) p));
 				*(p + len) = save;
 			} else
 #endif /* MYSQLND_STRING_TO_INT_CONVERSION */