From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Mon, 28 Feb 2022 17:00:26 +0000 (-0800)
Subject: Auto-detect wrapper when inflating and no window_bits specified.
X-Git-Tag: 2.1.0-beta1~342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81d7f95413330827edd3b6983b64a160752f8ea8;p=thirdparty%2Fzlib-ng.git

Auto-detect wrapper when inflating and no window_bits specified.
---

diff --git a/test/minideflate.c b/test/minideflate.c
index 68e9907d..7ee07e6d 100644
--- a/test/minideflate.c
+++ b/test/minideflate.c
@@ -227,7 +227,7 @@ void show_help(void) {
 int main(int argc, char **argv) {
     int32_t i;
     int32_t mem_level = DEF_MEM_LEVEL;
-    int32_t window_bits = MAX_WBITS;
+    int32_t window_bits = INT32_MAX;
     int32_t strategy = Z_DEFAULT_STRATEGY;
     int32_t level = Z_DEFAULT_COMPRESSION;
     int32_t read_buf_size = 4096;
@@ -274,6 +274,14 @@ int main(int argc, char **argv) {
 
     SET_BINARY_MODE(stdin);
     SET_BINARY_MODE(stdout);
+
+    if (window_bits == INT32_MAX) {
+        window_bits = MAX_WBITS;
+        /* Auto-detect wrapper for inflateInit */
+        if (uncompr)
+            window_bits += 32;
+    }
+
     if (i != argc) {
         fin = fopen(argv[i], "rb+");
         if (fin == NULL) {