From d7f5fdd19ab0a6693a9b5fd44999680bd97dd840 Mon Sep 17 00:00:00 2001
From: Mikhail Khachayants <mkhachaiants@gmail.com>
Date: Fri, 15 Nov 2024 00:21:08 +0200
Subject: [PATCH] fix and improve fuzzers

---
 test/fuzz/unzip_fuzzer.c |  1 +
 test/fuzz/zip_fuzzer.c   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/test/fuzz/unzip_fuzzer.c b/test/fuzz/unzip_fuzzer.c
index 82d919f4..e04c3f95 100644
--- a/test/fuzz/unzip_fuzzer.c
+++ b/test/fuzz/unzip_fuzzer.c
@@ -49,6 +49,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     if (!handle)
         return 1;
 
+    mz_zip_set_recover(handle, (size & 0xE0) == 0xE0);
     err = mz_zip_open(handle, stream, MZ_OPEN_MODE_READ);
 
     if (err == MZ_OK) {
diff --git a/test/fuzz/zip_fuzzer.c b/test/fuzz/zip_fuzzer.c
index f5a07520..de07e7f1 100644
--- a/test/fuzz/zip_fuzzer.c
+++ b/test/fuzz/zip_fuzzer.c
@@ -22,6 +22,7 @@ extern "C" {
 /***************************************************************************/
 
 #define MZ_FUZZ_TEST_FILENAME "foo"
+#define MZ_FUZZ_TEST_PWD      "test123"
 
 /***************************************************************************/
 
@@ -37,6 +38,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     int64_t fuzz_pos = 0;
     int32_t fuzz_length = 0;
     uint8_t *fuzz_buf = NULL;
+    const char *password = NULL;
 
     fuzz_stream = mz_stream_mem_create();
     if (!fuzz_stream)
@@ -77,6 +79,14 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         mz_stream_mem_delete(&fuzz_stream);
         return 1;
     }
+
+    err = mz_stream_mem_open(stream, MZ_FUZZ_TEST_FILENAME, MZ_OPEN_MODE_CREATE | MZ_OPEN_MODE_WRITE);
+    if (err != MZ_OK) {
+        mz_stream_mem_delete(&stream);
+        mz_stream_mem_delete(&fuzz_stream);
+        return 1;
+    }
+
     handle = mz_zip_create();
     if (!handle) {
         mz_stream_mem_delete(&stream);
@@ -86,7 +96,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
     err = mz_zip_open(handle, stream, MZ_OPEN_MODE_CREATE | MZ_OPEN_MODE_WRITE);
     if (err == MZ_OK) {
-        err = mz_zip_entry_write_open(handle, &file_info, compress_level, 0, NULL);
+        password = file_info.flag & MZ_ZIP_FLAG_ENCRYPTED ? MZ_FUZZ_TEST_PWD : NULL;
+        err = mz_zip_entry_write_open(handle, &file_info, compress_level, 0, password);
         if (err == MZ_OK) {
             mz_stream_mem_get_buffer_at_current(fuzz_stream, (const void **)&fuzz_buf);
             fuzz_pos = mz_stream_tell(fuzz_stream);