[PATCH 0/1] MR7660: libtiff: Provide zlib allocation functions.

[Nikolay Sivov (＠nsivov)]

This is required when zlib with -DZ_SOLO is used.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Same change submitted upstream https://gitlab.com/libtiff/libtiff/-/merge_requests/706

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7660

[PATCH 1/1] libtiff: Provide zlib allocation functions.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

This is required when zlib with -DZ_SOLO is used.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 libs/tiff/libtiff/tif_zip.c | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/libs/tiff/libtiff/tif_zip.c b/libs/tiff/libtiff/tif_zip.c
index 2a2a1d787f6..7a1515b6f1f 100644
--- a/libs/tiff/libtiff/tif_zip.c
+++ b/libs/tiff/libtiff/tif_zip.c
@@ -678,6 +678,25 @@ static const TIFFField zipFields[] = {
      TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE, "", NULL},
 };
 
+static void *TIFF_zalloc(void *opaque, unsigned int items, unsigned int size)
+{
+    static const char module[] = "TIFF_zalloc";
+    TIFF *tif = opaque;
+
+    if (items > ~(size_t)0 / size)
+    {
+        TIFFErrorExtR(tif, module, "Overflow");
+        return NULL;
+    }
+
+    return _TIFFmallocExt(tif, items * size);
+}
+
+static void TIFF_zfree(void *opaque, void *ptr)
+{
+    _TIFFfreeExt((TIFF *)opaque, ptr);
+}
+
 int TIFFInitZIP(TIFF *tif, int scheme)
 {
     static const char module[] = "TIFFInitZIP";
@@ -706,9 +725,9 @@ int TIFFInitZIP(TIFF *tif, int scheme)
     if (tif->tif_data == NULL)
         goto bad;
     sp = GetZIPState(tif);
-    sp->stream.zalloc = NULL;
-    sp->stream.zfree = NULL;
-    sp->stream.opaque = NULL;
+    sp->stream.zalloc = TIFF_zalloc;
+    sp->stream.zfree = TIFF_zfree;
+    sp->stream.opaque = tif;
     sp->stream.data_type = Z_BINARY;
 
     /*
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7660