]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 28 Jan 2020 16:17:07 +0000 (17:17 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 28 Jan 2020 16:17:07 +0000 (17:17 +0100)
* PHP-7.4:
  Fix mysqli_get_warnings() with multi queries

1  2 
ext/mysqli/mysqli_nonapi.c

index a988e11d3b86512e4b6fe4a544152a0e5a47e4ec,e3f64ae275271b56494415221bb46bbaacc64a64..ba725e6c519750eca85b07353ef99a0efcf75e94
@@@ -979,10 -973,10 +979,10 @@@ PHP_FUNCTION(mysqli_get_warnings
        MY_MYSQL                        *mysql;
        zval                            *mysql_link;
        MYSQLI_RESOURCE         *mysqli_resource;
-       MYSQLI_WARNING          *w;
+       MYSQLI_WARNING          *w = NULL;
  
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
 -              return;
 +              RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
  
@@@ -1008,10 -1003,10 +1009,10 @@@ PHP_FUNCTION(mysqli_stmt_get_warnings
        MY_STMT                         *stmt;
        zval                            *stmt_link;
        MYSQLI_RESOURCE         *mysqli_resource;
-       MYSQLI_WARNING          *w;
+       MYSQLI_WARNING          *w = NULL;
  
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &stmt_link, mysqli_stmt_class_entry) == FAILURE) {
 -              return;
 +              RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, stmt_link, MYSQLI_STATUS_VALID);