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 | |
| 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.
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.h | 8 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 20 |
2 files changed, 18 insertions, 10 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; \ } \ } \ } 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 */ |