Merge branch 'PHP-8.1' into PHP-8.2

ndossche · ndossche · commit ebb4488def2f · 2023-11-25T20:08:01.000+01:00
* PHP-8.1:
  Avoid using uninitialised struct
diff --git a/NEWS b/NEWS
@@ -24,6 +24,9 @@ PHP                                                                        NEWS
 - LibXML:
   . Fixed bug GH-12702 (libxml2 2.12.0 issue building from src). (nono303)
 
+- MySQLnd:
+  . Avoid using uninitialised struct. (mikhainin)
+
 - OpenSSL:
   . Fixed bug #50713 (openssl_pkcs7_verify() may ignore untrusted CAs).
     (Jakub Zelenka)
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
@@ -346,8 +346,8 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)
 					}
 					MYSQLND_INC_CONN_STATISTIC(conn->stats, statistic);
 				}
+				PACKET_FREE(&fields_eof);
 			} while (0);
-			PACKET_FREE(&fields_eof);
 			break; /* switch break */
 		}
 	} while (0);

Original file line number	Diff line number	Diff line change
`@@ -346,8 +346,8 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)`
`346`	`346`	`}`
`347`	`347`	`MYSQLND_INC_CONN_STATISTIC(conn->stats, statistic);`
`348`	`348`	`}`
	`349`	`+ PACKET_FREE(&fields_eof);`
`349`	`350`	`} while (0);`
`350`		`- PACKET_FREE(&fields_eof);`
`351`	`351`	`break; /* switch break */`
`352`	`352`	`}`
`353`	`353`	`} while (0);`