From 5f486dd1d5ffb5d2913e22528ffe1ba5b5058a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?= Date: Fri, 21 Oct 2022 17:29:57 +0200 Subject: [PATCH] Fix mariadb-client-library processing of empty split compressed packet --- deps/Makefile | 1 + .../empty_split_compress_packet.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 deps/mariadb-client-library/empty_split_compress_packet.patch diff --git a/deps/Makefile b/deps/Makefile index 13eed9c52..daa1d69ec 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -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 diff --git a/deps/mariadb-client-library/empty_split_compress_packet.patch b/deps/mariadb-client-library/empty_split_compress_packet.patch new file mode 100644 index 000000000..2d7aa187b --- /dev/null +++ b/deps/mariadb-client-library/empty_split_compress_packet.patch @@ -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)