]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 21 Feb 2019 12:45:25 +0000 (13:45 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 21 Feb 2019 12:45:53 +0000 (13:45 +0100)
1  2 
NEWS
ext/mysqlnd/mysqlnd_result.c

diff --cc NEWS
index 3e7c589a66c941c429800fec57f1631f08547856,72d8fac99d200bff245712f7bbe25327c80b9ffc..2e83685ba2a1eec435d4167cbe6fb60b03c71fe9
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,11 +1,11 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2019, PHP 7.2.17
 +?? ??? ????, PHP 7.3.4
  
 -07 Mar 2019, PHP 7.2.16
+ - MySQLi:
+   . Fixed bug #77597 (mysqli_fetch_field hangs scripts). (Nikita)
 +21 Feb 2019, PHP 7.3.3
  
  - Core:
    . Fixed bug #77589 (Core dump using parse_ini_string with numeric sections).
index 201e314f7d51d6a22c55132dd48cc9014f324bf7,5e8360994796859653658e92a0b1ebfe7903dd5b..5e3b86e12d9b621df2f29a0aa73d63d7b3d9f95e
@@@ -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;