diff options
| author | Andrey Hristov <andrey@php.net> | 2008-09-16 14:35:01 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-09-16 14:35:01 +0000 |
| commit | b429a84c2ba16c03094066a9db6cfe1b15a4bb37 (patch) | |
| tree | 39464b6a030d4f36c59377f0de3c966df3b4b2de /ext/mysqlnd/mysqlnd_statistics.h | |
| parent | bbbb0f1ae54ca6b86070bc1de148b66458b0968e (diff) | |
| download | php-git-b429a84c2ba16c03094066a9db6cfe1b15a4bb37.tar.gz | |
MFH:
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h index dc4ab7ac20..1215a13681 100644 --- a/ext/mysqlnd/mysqlnd_statistics.h +++ b/ext/mysqlnd/mysqlnd_statistics.h @@ -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; \ } \ } \ } @@ -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; \ } \ } \ } |