From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 21 Feb 2019 12:45:25 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.4RC1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5d8ac92a481291cddf5a6879b7b83defb514c16;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

e5d8ac92a481291cddf5a6879b7b83defb514c16
diff --cc NEWS
index 3e7c589a66,72d8fac99d..2e83685ba2
--- a/NEWS
+++ b/NEWS
@@@ -1,8 -1,11 +1,11 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2019, PHP 7.2.17
 +?? ??? ????, PHP 7.3.4
  
+ - MySQLi:
+   . Fixed bug #77597 (mysqli_fetch_field hangs scripts). (Nikita)
+ 
 -07 Mar 2019, PHP 7.2.16
 +21 Feb 2019, PHP 7.3.3
  
  - Core:
    . Fixed bug #77589 (Core dump using parse_ini_string with numeric sections).
diff --cc ext/mysqlnd/mysqlnd_result.c
index 201e314f7d,5e83609947..5e3b86e12d
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@@ -106,13 -106,13 +106,13 @@@ MYSQLND_METHOD(mysqlnd_result_buffered_
  			DBG_RETURN(FAIL);
  		}
  
- 		for (i = 0; i < result->row_count; i++) {
- 			/* (i / 8) & the_bit_for_i*/
- 			if (ZEND_BIT_TEST(initialized, i)) {
+ 		for (row = 0; row < result->row_count; row++) {
 -			/* (i / 8) & the_bit_for_i*/
 -			if (initialized[row >> 3] & (1 << (row & 7))) {
++			/* (row / 8) & the_bit_for_row*/
++			if (ZEND_BIT_TEST(initialized, row)) {
  				continue;
  			}
  
- 			rc = result->m.row_decoder(&result->row_buffers[i], current_row, field_count, meta->fields, int_and_float_native, stats);
 -			rc = result->m.row_decoder(result->row_buffers[row], current_row, field_count, meta->fields, int_and_float_native, stats);
++			rc = result->m.row_decoder(&result->row_buffers[row], current_row, field_count, meta->fields, int_and_float_native, stats);
  
  			if (rc != PASS) {
  				ret = FAIL;