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

Timestamp:

Nov 11, 2010 11:10:10 AM (14 years ago)

Author:

vboxsync

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

67635

Message:

vfs: the gunzip stream works, except for some double frees somewhere.

File:

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

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

@@ -30 +30 @@
 *******************************************************************************/
 #include "internal/iprt.h"
-#include <iprt/vfslowlevel.h>
+#include <iprt/zip.h>
 
 #include <iprt/assert.h>
@@ -37 +37 @@
 #include <iprt/poll.h>
 #include <iprt/string.h>
+#include <iprt/vfslowlevel.h>
+
 #include <zlib.h>
 
@@ -477 +479 @@
     AssertPtrReturn(phVfsIosOut, VERR_INVALID_POINTER);
 
+    uint32_t cRefs = RTVfsIoStrmRetain(hVfsIosIn);
+    AssertReturn(cRefs != UINT32_MAX, VERR_INVALID_HANDLE);
+
     /*
      * Create the decompression I/O stream.
@@ -507 +512 @@
              */
             size_t cbRead = 0;
-            rc = RTVfsIoStrmRead(pThis->hVfsIos, pThis->abBuffer, sizeof(RTZIPGZIPHDR), NULL /*pcbRead*/);
+            rc = RTVfsIoStrmRead(pThis->hVfsIos, pThis->abBuffer, sizeof(RTZIPGZIPHDR), true /*fBlocking*/, NULL /*pcbRead*/);
             if (RT_SUCCESS(rc))
             {
@@ -539 +544 @@
         }
         else
-            rc = rtZipGzipConvertErrFromZlib(pThis, rc);
+            rc = rtZipGzipConvertErrFromZlib(pThis, rc); /** @todo cleaning up in this situation is going to go wrong. */
+        RTVfsIoStrmRelease(hVfsIos);
     }
+    else
+        RTVfsIoStrmRelease(hVfsIosIn);
     return rc;
 }