diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-07-25 06:54:20 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-07-25 06:54:20 +0100 |
| commit | 8d5a5fbf6b2504cb1589d1fc9031f89c057ca871 (patch) | |
| tree | b3dc803512d190213efb170a755bfcd6b7ab0a93 /ext/mysqli/mysqli.c | |
| parent | 2e8759428b83bd499c4b4571e62c3fb663e18dd6 (diff) | |
| parent | 78ad5e8864feec55e3aecfd96b369a62ffb953ee (diff) | |
| download | php-git-8d5a5fbf6b2504cb1589d1fc9031f89c057ca871.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
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 707a301045..d1588f1439 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1152,7 +1152,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; @@ -1166,8 +1166,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; |