mysqli_result::__construct should throw exceptions (#7855)

kamil-tekiela · web-flow · commit 50c7512f5213 · 2021-12-30T14:08:12.000Z
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
@@ -980,8 +980,12 @@ PHP_METHOD(mysqli_result, __construct)
 	}
 
 	if (!result) {
+		MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
 		RETURN_FALSE;
 	}
+	if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
+		php_mysqli_report_index("from previous query", mysqli_server_status(mysql->mysql));
+	}
 
 	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
 	mysqli_resource->ptr = (void *)result;

Original file line number	Diff line number	Diff line change
`@@ -980,8 +980,12 @@ PHP_METHOD(mysqli_result, __construct)`
`980`	`980`	`}`
`981`	`981`
`982`	`982`	`if (!result) {`
	`983`	`+ MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);`
`983`	`984`	`RETURN_FALSE;`
`984`	`985`	`}`
	`986`	`+ if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {`
	`987`	`+ php_mysqli_report_index("from previous query", mysqli_server_status(mysql->mysql));`
	`988`	`+ }`
`985`	`989`
`986`	`990`	`mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));`
`987`	`991`	`mysqli_resource->ptr = (void *)result;`