Changeset 34952 in vbox for trunk/src/VBox

Timestamp:

Dec 10, 2010 2:15:46 PM (14 years ago)

Author:

vboxsync

Message:

tar.cpp: < 8GB, not <=. Added note about using 256-base encoding with the old ustar format. Return MIN/MAX instead of 0 on overflow.

File:

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

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

@@ -195 +195 @@
 DECLINLINE(void) rtTarSizeToRec(PRTTARRECORD pRecord, uint64_t cbSize)
 {
-    /* Small enough for the standard octal string encoding? */
-    if (cbSize <= 2 * _4G)
+    /*
+     * Small enough for the standard octal string encoding?
+     *
+     * Note! We could actually use the terminator character as well if we liked,
+     *       but let not do that as it's easier to test this way.
+     */
+    if (cbSize < _4G * 2U)
         RTStrPrintf(pRecord->h.size, sizeof(pRecord->h.size), "%0.11llo", cbSize);
     else
@@ -204 +209 @@
          * We don't deal with negatives here, cause the size have to be greater
          * than zero.
+         *
+         * Note! The base-256 extension are never used by gtar or libarchive
+         *       with the "ustar  \0" format version, only the later
+         *       "ustar\000" version.  However, this shouldn't cause much
+         *       trouble as they are not picky about what they read.
          */
         size_t cchField = sizeof(pRecord->h.size) - 1;
@@ -210 +220 @@
         do
         {
-            puchField[cchField--] = cbSize & ((1 << 8) - 1);
-            cbSize = (cbSize >> 8);
+            puchField[cchField--] = cbSize & 0xff;
+            cbSize >>= 8;
         } while (cchField);
     }
@@ -239 +249 @@
                             || cbSize < INT64_MIN / 256))
             {
-                cbSize = 0;
+                cbSize = cbSize < 0 ? INT64_MIN : INT64_MAX;
                 break;
             }
@@ -319 +329 @@
     /** @todo check for field overflows. */
     /* Fill the header record */
-//    RT_ZERO(pRecord);
+//    RT_ZERO(pRecord); - done by the caller.
     RTStrPrintf(pRecord->h.name,  sizeof(pRecord->h.name),  "%s",       pszSrcName);
     RTStrPrintf(pRecord->h.mode,  sizeof(pRecord->h.mode),  "%0.7o",    fmode);