diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-07-25 06:51:44 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-07-25 06:51:44 +0100 |
| commit | 78ad5e8864feec55e3aecfd96b369a62ffb953ee (patch) | |
| tree | e1382a1692befb9d5604616172f6c949bd21cd3c /ext/mysqli/mysqli.c | |
| parent | dbc2ffba822d13e74e37f5ba6e106f163c1008e8 (diff) | |
| parent | 69b48f83dfc287a8430cf8e993d0937c5128623f (diff) | |
| download | php-git-78ad5e8864feec55e3aecfd96b369a62ffb953ee.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
minor loop optimizations, closes #2633
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 56b88c4827..a42dcc20ee 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1149,7 +1149,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend { #if !defined(MYSQLI_USE_MYSQLND) MYSQL_ROW row; - unsigned int i; + unsigned int i, num_fields; MYSQL_FIELD *fields; zend_ulong *field_len; @@ -1163,8 +1163,9 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend array_init(return_value); field_len = mysql_fetch_lengths(result); + num_fields = mysql_num_fields(result); - for (i = 0; i < mysql_num_fields(result); i++) { + for (i = 0; i < num_fields; i++) { if (row[i]) { zval res; |