Use custom allocator everywhere zlib is used.

1 files changed, 12 insertions, 2 deletions

diff --git a/source/fitz/unzip.c b/source/fitz/unzip.c
index c5798fa8..4eb90dda 100644
--- a/source/fitz/unzip.c
+++ b/source/fitz/unzip.c
@@ -37,6 +37,16 @@ struct fz_zip_archive_s
 	zip_entry *entries;
 };
 
+static void *zalloc_zip(void *opaque, unsigned int items, unsigned int size)
+{
+	return fz_malloc_array_no_throw(opaque, items, size);
+}
+
+static void zfree_zip(void *opaque, void *address)
+{
+	fz_free(opaque, address);
+}
+
 static void drop_zip_archive(fz_context *ctx, fz_archive *arch)
 {
 	fz_zip_archive *zip = (fz_zip_archive *) arch;
@@ -323,8 +333,8 @@ static fz_buffer *read_zip_entry(fz_context *ctx, fz_archive *arch, const char *
 		{
 			fz_read(ctx, file, cbuf, ent->csize);
 
-			z.zalloc = (alloc_func) fz_malloc_array;
-			z.zfree = (free_func) fz_free;
+			z.zalloc = zalloc_zip;
+			z.zfree = zfree_zip;
 			z.opaque = ctx;
 			z.next_in = cbuf;
 			z.avail_in = ent->csize;