From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 28 Jan 2020 16:17:07 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d3a6e7149260c35e80d85d349068347829b947a;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix mysqli_get_warnings() with multi queries
---

7d3a6e7149260c35e80d85d349068347829b947a
diff --cc ext/mysqli/mysqli_nonapi.c
index a988e11d3b,e3f64ae275..ba725e6c51
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@@ -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);