Changeset 61970 in vbox for trunk/src

Timestamp:

Jun 30, 2016 6:28:06 PM (8 years ago)

Author:

vboxsync

Message:

Runtime/xarvfs.cpp: Fix another handle leak for files in a XAR stream

File:

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

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

@@ -1033 +1033 @@
 
 /**
+ * @interface_method_impl{RTVFSOBJOPS,pfnClose}
+ */
+static DECLCALLBACK(int) rtZipXarFssFile_Close(void *pvThis)
+{
+    PRTZIPXARFILE pThis = (PRTZIPXARFILE)pvThis;
+
+    RTVfsFileRelease(pThis->hVfsFile);
+    pThis->hVfsFile = NIL_RTVFSFILE;
+
+    return rtZipXarFssIos_Close(&pThis->Ios);
+}
+
+
+/**
  * @interface_method_impl{RTVFSOBJSETOPS,pfnMode}
  */
@@ -1130 +1144 @@
             RTVFSOBJTYPE_FILE,
             "XarFsStream::File",
-            rtZipXarFssIos_Close,
+            rtZipXarFssFile_Close,
             rtZipXarFssIos_QueryInfo,
             RTVFSOBJOPS_VERSION
@@ -1173 +1187 @@
     pThis->hVfsIosDecompressor = NIL_RTVFSIOSTREAM;
 
-    int rc = RTVfsIoStrmRelease(pThis->hVfsIosRaw);
+    RTVfsIoStrmRelease(pThis->hVfsIosRaw);
     pThis->hVfsIosRaw = NIL_RTVFSIOSTREAM;
     pThis->pIosRaw = NULL;
 
-    return rc;
+    return VINF_SUCCESS;
 }