archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source 
* PHP-8.1:
  Add NEWS entry for #9841
  Add a temporary fix for insufficient buffer size in mysqlnd (#9835)
  mysqli_query throws warning despite using silenced error mode (#9842)
This commit is contained in:
Kamil Tekiela 2022-10-27 18:34:14 +01:00
commit 646b8f6b5c
No known key found for this signature in database
GPG key ID: 0760BDAB1E89A1E3
3 changed files with 81 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -301,6 +301,7 @@ mysqlnd_read_packet_header_and_body(MYSQLND_PACKET_HEADER * packet_header,
if (buf_size < packet_header->size) {
DBG_ERR_FMT("Packet buffer %zu wasn't big enough %zu, %zu bytes will be unread",
buf_size, packet_header->size, packet_header->size - buf_size);
SET_CLIENT_ERROR(error_info, CR_INVALID_BUFFER_USE, UNKNOWN_SQLSTATE, "Packet buffer wasn't big enough; as a workaround consider increasing value of net_cmd_buffer_size");
DBG_RETURN(FAIL);
}
if (FAIL == pfc->data->m.receive(pfc, vio, buf, packet_header->size, stats, error_info)) {