From 24733834919a3676e51cf802ac90eb24d60e8a6f Mon Sep 17 00:00:00 2001
From: Rahim Kanji <rahim.kanji@outlook.com>
Date: Thu, 21 Dec 2023 12:29:26 +0500
Subject: [PATCH] Updated ma_array.c-multiplication-overflow.patch

---
 deps/Makefile                                      |  2 +-
 .../ma_array.c-multiplication-overflow.patch       | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/deps/Makefile b/deps/Makefile
index 1bc96216c..4fed1cb3b 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -255,6 +255,7 @@ ifeq ($(WITHASAN),1)
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_asan.patch
 endif
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_dyncol.c-multiplication-overflow.patch
+	cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_array.c-multiplication-overflow.patch
 	cd mariadb-client-library/mariadb_client && patch include/mariadb_com.h < ../mariadb_com.h.patch
 #	cd mariadb-client-library/mariadb_client && patch libmariadb/ma_pvio.c < ../ma_pvio.c.patch
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../client_deprecate_eof.patch
@@ -262,7 +263,6 @@ endif
 	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
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_stmt_store_result_err.patch
-	cd mariadb-client-library/mariadb_client && patch libmariadb/ma_array.c < ../ma_array.c-multiplication-overflow.patch
 	cd mariadb-client-library/mariadb_client && patch zlib/zutil.c < ../zutil.c-multiplication-overflow.patch
 	# patches for replication testing
 	cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_rpl.c < ../mariadb_rpl.c.patch
diff --git a/deps/mariadb-client-library/ma_array.c-multiplication-overflow.patch b/deps/mariadb-client-library/ma_array.c-multiplication-overflow.patch
index 76bcb496f..80e20be2b 100644
--- a/deps/mariadb-client-library/ma_array.c-multiplication-overflow.patch
+++ b/deps/mariadb-client-library/ma_array.c-multiplication-overflow.patch
@@ -1,4 +1,8 @@
-@@ -46,7 +46,7 @@
+diff --git libmariadb/ma_array.c libmariadb/ma_array.c
+index d067aa4a..81fc3c40 100644
+--- libmariadb/ma_array.c
++++ libmariadb/ma_array.c
+@@ -46,7 +46,7 @@ my_bool ma_init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,
    array->max_element=init_alloc;
    array->alloc_increment=alloc_increment;
    array->size_of_element=element_size;
@@ -7,7 +11,7 @@
    {
      array->max_element=0;
      return(TRUE);
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ unsigned char *ma_alloc_dynamic(DYNAMIC_ARRAY *array)
    if (array->elements == array->max_element)
    {
      char *new_ptr;
@@ -16,7 +20,7 @@
  			          array->alloc_increment)*
  				   array->size_of_element)))
        return 0;
-@@ -111,14 +111,14 @@
+@@ -111,14 +111,14 @@ my_bool ma_set_dynamic(DYNAMIC_ARRAY *array, void * element, uint idx)
        char *new_ptr;
        size=(idx+array->alloc_increment)/array->alloc_increment;
        size*= array->alloc_increment;
@@ -33,7 +37,7 @@
      array->elements=idx+1;
    }
    memcpy(array->buffer+(idx * array->size_of_element),element,
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ void ma_delete_dynamic_element(DYNAMIC_ARRAY *array, uint idx)
    char *ptr=array->buffer+array->size_of_element*idx;
    array->elements--;
    memmove(ptr,ptr+array->size_of_element,
@@ -42,7 +46,7 @@
  }
  
  
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ void ma_freeze_size(DYNAMIC_ARRAY *array)
    if (array->buffer && array->max_element != elements)
    {
      array->buffer=(char*) realloc(array->buffer,