Changeset 82594 in vbox for trunk/src/VBox/Runtime/common/zip

Timestamp:

Dec 16, 2019 5:58:08 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135479

Message:

Runtime/zip.cpp: Allow RTZIPTYPE_ZLIB_NO_HEADER in the block decompression API

File:

• trunk/src/VBox/Runtime/common/zip/zip.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/zip/zip.cpp

@@ -1935 +1935 @@
 
         case RTZIPTYPE_ZLIB:
+        case RTZIPTYPE_ZLIB_NO_HEADER:
         {
 #ifdef RTZIP_USE_ZLIB
@@ -1947 +1948 @@
             ZStrm.avail_out = (uInt)cbDst;
 
-            int rc = inflateInit(&ZStrm);
+            int rc;
+            if (enmType == RTZIPTYPE_ZLIB)
+                rc = inflateInit(&ZStrm);
+            else if (enmType == RTZIPTYPE_ZLIB_NO_HEADER)
+                rc = inflateInit2(&ZStrm, -Z_DEF_WBITS);
+            else
+                AssertFailedReturn(VERR_INTERNAL_ERROR);
+
             if (RT_UNLIKELY(rc != Z_OK))
                 return zipErrConvertFromZlib(rc, false /*fCompressing*/);