Replace 3 more warnings with errors

Author: kamil-tekiela

ext/mysqli/tests/ghsa-h35g-vwh6-m678-auth-message.phpt

@@ -32,7 +32,5 @@ print "done!";
 [*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
 [*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
 [*] Sending - Malicious OK Auth Response [Extract heap through buffer over-read]: 0900000200000002000000fcff
-
-Warning: mysqli::__construct(): OK packet message length is past the packet size in %s on line %d
-Unknown error while trying to connect via tcp://127.0.0.1:50001
+OK packet message length is past the packet size
 done!

ext/mysqli/tests/ghsa-h35g-vwh6-m678-def.phpt

@@ -19,12 +19,10 @@ $conn = new mysqli($servername, $username, $password, "", $port);
 
 echo "[*] Running query on the fake server...\n";
 
-$result = $conn->query("SELECT * from users");
-
-if ($result) {
-    $all_fields = $result->fetch_fields();
-    var_dump($result->fetch_all(MYSQLI_ASSOC));
-    var_dump(get_object_vars($all_fields[0])["def"]);
+try {
+    $result = $conn->query("SELECT * from users");
+} catch (mysqli_sql_exception $exception) {
+    echo $exception->getMessage() . PHP_EOL;
 }
 
 $conn->close();
@@ -42,6 +40,5 @@ print "done!";
 [*] Running query on the fake server...
 [*] Received: 140000000353454c454354202a2066726f6d207573657273
 [*] Sending - Malicious Tabular Response [Extract heap through buffer over-read]: 01000001011e0000020164016401640164016401640c3f000b000000030350000000fd000001aa05000003fe00002200040000040135017405000005fe00002200
-
-Warning: mysqli::query(): Protocol error. Server sent default for unsupported field list (mysqlnd_wireprotocol.c:%d) in %s on line %d
+Server sent default for unsupported field list
 done!

ext/mysqli/tests/ghsa-h35g-vwh6-m678-filename.phpt

@@ -17,7 +17,12 @@ $process->wait();
 $conn = new mysqli($servername, $username, $password, "", $port);
 echo "[*] Running query on the fake server...\n";
 
-$result = $conn->query("SELECT * from users");
+try {
+    $result = $conn->query("SELECT * from users");
+} catch (mysqli_sql_exception $exception) {
+    echo $exception->getMessage() . PHP_EOL;
+}
+
 $info = mysqli_info($conn);
 
 var_dump($info);
@@ -35,9 +40,6 @@ print "done!";
 [*] Running query on the fake server...
 [*] Received: 140000000353454c454354202a2066726f6d207573657273
 [*] Sending - Malicious Tabular Response [Extract heap through buffer over-read]: 0900000100000000000000fa65
-
-Warning: mysqli::query(): RSET_HEADER packet additional data length is past 249 bytes the packet size in %s on line %d
-
-Warning: mysqli::query(): Error reading result set's header in %s on line %d
+RSET_HEADER packet additional data length is past the packet size
 NULL
 done!

ext/mysqlnd/mysqlnd_wireprotocol.c

@@ -736,8 +736,7 @@ php_mysqlnd_auth_response_read(MYSQLND_CONN_DATA * conn, void * _packet)
 			/* p can get past packet size when getting field length so it needs to be checked first
 			 * and after that it can be checked that the net_len is not greater than the packet size */
 			if ((p - buf) > packet->header.size || packet->header.size - (p - buf) < net_len) {
-				DBG_ERR_FMT("OK packet message length is past the packet size");
-				php_error_docref(NULL, E_WARNING, "OK packet message length is past the packet size");
+				SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "OK packet message length is past the packet size");
 				DBG_RETURN(FAIL);
 			}
 			packet->message_len = net_len;
@@ -1121,11 +1120,7 @@ php_mysqlnd_rset_header_read(MYSQLND_CONN_DATA * conn, void * _packet)
 				 * and after that it can be checked that the len is not greater than the packet size */
 				if ((p - buf) > packet->header.size || packet->header.size - (p - buf) < len) {
 					size_t local_file_name_over_read = ((p - buf) - packet->header.size) + len;
-					DBG_ERR_FMT("RSET_HEADER packet additional data length is past %zu bytes the packet size",
-						local_file_name_over_read);
-					php_error_docref(NULL, E_WARNING,
-						"RSET_HEADER packet additional data length is past %zu bytes the packet size",
-						local_file_name_over_read);
+					SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "RSET_HEADER packet additional data length is past the packet size");
 					DBG_RETURN(FAIL);
 				}
 				packet->info_or_local_file.s = mnd_emalloc(len + 1);
@@ -1278,10 +1273,7 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
 		(len = php_mysqlnd_net_field_length(&p)) &&
 		len != MYSQLND_NULL_LENGTH)
 	{
-		DBG_ERR_FMT("Protocol error. Server sent default for unsupported field list");
-		php_error_docref(NULL, E_WARNING,
-			"Protocol error. Server sent default for unsupported field list (mysqlnd_wireprotocol.c:%u)",
-			__LINE__);
+		SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Server sent default for unsupported field list");
 		DBG_RETURN(FAIL);
 	}