Changeset 59753 in vbox

Timestamp:

Feb 20, 2016 1:51:56 AM (9 years ago)

Author:

vboxsync

Message:

gzipvfs.cpp: Pass correct flag to autodetect gzip header. Can't tell zlib to not detect zlib headers via inflateInit2 it seems, but never mind, we're checking that right below ourselfes.

File:

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

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

@@ -710 +710 @@
         memset(&pThis->Zlib, 0, sizeof(pThis->Zlib));
         pThis->Zlib.opaque  = pThis;
-        rc = inflateInit2(&pThis->Zlib,
-                          fFlags & RTZIPGZIPDECOMP_F_ALLOW_ZLIB_HDR
-                          ? MAX_WBITS
-                          : MAX_WBITS + 16 /* autodetect gzip header */);
+        rc = inflateInit2(&pThis->Zlib, MAX_WBITS | RT_BIT(5) /* autodetect gzip header */);
         if (rc >= 0)
         {
@@ -720 +717 @@
              * a gzip stream as specified by the user.
              *
-             * Note!. Since we've told zlib to check for the gzip header, we
-             *        prebuffer what we read in the input buffer so it can
-             *        be handed on to zlib later on.
+             * Note! Since we've told zlib to check for the gzip header, we
+             *       prebuffer what we read in the input buffer so it can
+             *       be handed on to zlib later on.
              */
             rc = RTVfsIoStrmRead(pThis->hVfsIos, pThis->abBuffer, sizeof(RTZIPGZIPHDR), true /*fBlocking*/, NULL /*pcbRead*/);