From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 11 Nov 2019 08:58:10 +0000 (+0100)
Subject: Fix #78790: mysqli_get_client_info() expects exactly 0 parameters
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87fad8cdf0b978bb7dca5123cb77efd1449c0132;p=php

Fix #78790: mysqli_get_client_info() expects exactly 0 parameters

`mysqli_get_client_info()` and `mysqli_thread_safe()` can also be
called as methods, so we have to cater to this when parsing the
arguments.
---

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index aac3134a59..e51c0cc741 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1374,7 +1374,9 @@ PHP_FUNCTION(mysqli_free_result)
    Get MySQL client info */
 PHP_FUNCTION(mysqli_get_client_info)
 {
-	if (zend_parse_parameters_none() == FAILURE) {
+	zval *mysql_link;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
 		return;
 	}
 
@@ -2631,7 +2633,9 @@ PHP_FUNCTION(mysqli_thread_id)
    Return whether thread safety is given or not */
 PHP_FUNCTION(mysqli_thread_safe)
 {
-	if (zend_parse_parameters_none() == FAILURE) {
+	zval *mysql_link;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
 		return;
 	}