Changeset 16823 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Feb 17, 2009 10:41:45 AM (16 years ago)

Author:

vboxsync

Message:

Runtime/zip: make zlib reader more greedy to fix issue with incompressible blocks which are slightly larger than the input buffer in a more sane way.

File:

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

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

@@ -34 +34 @@
 *******************************************************************************/
 #define RTZIP_USE_STORE 1
-//#define RTZIP_USE_ZLIB 1
+#define RTZIP_USE_ZLIB 1
 //#define RTZIP_USE_BZLIB 1
 #define RTZIP_USE_LZF 1
@@ -555 +555 @@
     pZip->u.Zlib.avail_out = cbBuf;
     int rc = Z_OK;
-    while (pZip->u.Zlib.avail_out > 0)
+    /* Be greedy reading input, even if no output buffer is left. It's possible
+     * that it's just the end of stream marker which needs to be read. Happens
+     * for incompressible blocks just larger than the input buffer size.*/
+    while (pZip->u.Zlib.avail_out > 0 || pZip->u.Zlib.avail_in <= 0)
     {
         /*