From 63cc905bbca0f40680af2cb3794e7b519804fce7 Mon Sep 17 00:00:00 2001
From: Jukka Ojanen <jukka.ojanen@kolumbus.fi>
Date: Thu, 2 Sep 2021 14:59:38 +0300
Subject: [PATCH] Refactor zip file reading

---
 src/filehandling.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/filehandling.c b/src/filehandling.c
index f8a8452a3..999009ed9 100644
--- a/src/filehandling.c
+++ b/src/filehandling.c
@@ -412,10 +412,25 @@ size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp)
   else if (fp->ufp)
   {
     u64 len = (u64) size * nmemb;
-    if (len == (unsigned) len)
+    u64 pos = 0;
+
+    /* assume success */
+    n = nmemb;
+
+    do
     {
-      n = unzReadCurrentFile (fp->ufp, ptr, (unsigned) len);
-    }    
+      unsigned chunk = (len > HCFILE_CHUNK_SIZE) ? HCFILE_CHUNK_SIZE : (unsigned) len;
+      int result = unzReadCurrentFile (fp->ufp, (unsigned char *) ptr + pos, chunk);
+      if (result < 0) return -1;
+      pos += (u64) result;
+      len -= (u64) result;
+      if (chunk != (unsigned) result)
+      {
+        /* partial read */
+        n = pos / size;
+        break;
+      }
+    } while (len);
   }
   else if (fp->xfp)
   {