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

Timestamp:

Jun 1, 2017 1:14:26 PM (8 years ago)

Author:

vboxsync

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

115888

Message:

IPRT: rtZipTarFssWriter_WriteGnuSparseHeaders: isextended location differs between the normal GNU header and the sparse GNU header.

File:

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

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

@@ -1161 +1161 @@
     AssertRCReturn(rc, rc);
 
+    Assert(pThis->aHdrs[0].Gnu.isextended == 0);
+
     /*
      * Walk the sparse spans, fill and write headers one by one.
@@ -1179 +1181 @@
             if (iSparse >= cSparse)
             {
-                pThis->aHdrs[0].Gnu.isextended = 1; /* more headers to come */
-                if (cSparse == RT_ELEMENTS(pThis->aHdrs[0].Gnu.sparse))
+                if (cSparse != RT_ELEMENTS(pThis->aHdrs[0].Gnu.sparse))
+                    pThis->aHdrs[0].GnuSparse.isextended = 1; /* more headers to come */
+                else
+                {
+                    pThis->aHdrs[0].Gnu.isextended = 1; /* more headers to come */
                     rc = rtZipTarFssWriter_ChecksumHdr(&pThis->aHdrs[0]);
+                }
                 if (RT_SUCCESS(rc))
                     rc = RTVfsIoStrmWrite(pThis->hVfsIos, &pThis->aHdrs[0], sizeof(pThis->aHdrs[0]), true /*fBlocking*/, NULL);
@@ -1206 +1212 @@
     if (iSparse != 0)
     {
-        Assert(pThis->aHdrs[0].Gnu.isextended == 0);
+        Assert(pThis->aHdrs[0].GnuSparse.isextended == 0);
         rc = RTVfsIoStrmWrite(pThis->hVfsIos, &pThis->aHdrs[0], sizeof(pThis->aHdrs[0]), true /*fBlocking*/, NULL);
     }