Updated zutil.c-multiplication-overflow.patch

deps/Makefile

@@ -256,6 +256,7 @@ ifeq ($(WITHASAN),1)
 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 -p0 < ../zutil.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
@@ -263,7 +264,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 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
 	cd mariadb-client-library/mariadb_client && patch include/mariadb_rpl.h < ../mariadb_rpl.h.patch

deps/mariadb-client-library/zutil.c-multiplication-overflow.patch

@@ -1,7 +1,11 @@
-@@ -303,7 +303,7 @@
+diff --git external/zlib/zutil.c external/zlib/zutil.c
+index 9543ae82..6a1ed031 100644
+--- external/zlib/zutil.c
++++ external/zlib/zutil.c
+@@ -310,7 +310,7 @@ voidpf ZLIB_INTERNAL zcalloc(opaque, items, size)
      unsigned size;
  {
-     if (opaque) items += size - size; /* make compiler happy */
+     (void)opaque;
 -    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
 +    return sizeof(uInt) > 2 ? (voidpf)malloc((long) items * size) :
                                (voidpf)calloc(items, size);