Fix mariadb-client-library processing of empty split compressed packet

pull/3995/head
Javier Jaramago Fernández 4 years ago
parent b41dffeb64
commit 5f486dd1d5

1
deps/Makefile vendored

@ -230,6 +230,7 @@ endif
cd mariadb-client-library/mariadb_client && patch -p0 < ../client_deprecate_eof.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../cr_new_stmt_metadata_removal.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../ps_buffer_stmt_read_all_rows.patch
cd mariadb-client-library/mariadb_client && patch -p0 < ../empty_split_compress_packet.patch
ifeq ($(WITHASAN),1)
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_asan.patch
endif

@ -0,0 +1,12 @@
diff --git libmariadb/ma_net.c libmariadb/ma_net.c
index 15be4fc..39a8138 100644
--- libmariadb/ma_net.c
+++ libmariadb/ma_net.c
@@ -498,6 +498,7 @@ ulong ma_net_read(NET *net)
{
current+= 4; /* length + sequence_id,
no more data will follow */
+ is_multi_packet = 0;
break;
}
if (packet_length + 4 <= buffer_length - current)
Loading…
Cancel
Save