Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Avoid using uninitialised struct
This commit is contained in:
Niels Dossche 2023-11-25 20:08:01 +01:00
commit ebb4488def
2 changed files with 4 additions and 1 deletions

3
NEWS
View File

@ -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)

View File

@ -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);