diff options
| author | Andrey Hristov <andrey@php.net> | 2008-09-16 14:34:11 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-09-16 14:34:11 +0000 |
| commit | a7226f1a0394bee4d39873e63f2420cd2eb99d34 (patch) | |
| tree | 7035270c336a9e4623c4ef1990d3026ae0257fe8 /ext/mysqlnd/mysqlnd_statistics.h | |
| parent | 07aac764a5aff0f54f8544c709f676d19bf3cf05 (diff) | |
| download | php-git-a7226f1a0394bee4d39873e63f2420cd2eb99d34.tar.gz | |
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.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.h | 12 |
1 files changed, 6 insertions, 6 deletions
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; \ } \ } \ } |