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

Timestamp:

Oct 3, 2013 3:31:32 PM (12 years ago)

Author:

vboxsync

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

89513

Message:

build fix

File:

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

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

@@ -143 +143 @@
     RTFOFF                  offData;
     /** The size of the archived data. */
-    uint64_t                cbDataArchived;
+    RTFOFF                  cbDataArchived;
     /** The size of the extracted data. */
-    uint64_t                cbDataExtracted;
+    RTFOFF                  cbDataExtracted;
     /** The encoding of the archived ata. */
     RTZIPXARENCODING        enmEncoding;
@@ -395 +395 @@
  */
 static int rtZipXarGetOffsetSizeLengthFromElem(xml::ElementNode const *pElement,
-                                               PRTFOFF poff, uint64_t *pcbSize, uint64_t *pcbLength)
+                                               PRTFOFF poff, PRTFOFF pcbSize, PRTFOFF pcbLength)
 {
     /*
@@ -425 +425 @@
         return VERR_XAR_BAD_SIZE_ELEMENT;
 
-    rc = RTStrToUInt64Full(pszValue, 0, pcbSize);
+    rc = RTStrToInt64Full(pszValue, 0, pcbSize);
     if (   RT_FAILURE(rc)
         || rc == VWRN_NUMBER_TOO_BIG
-        || *pcbSize >= UINT64_MAX / 2 /* prevent overflow casting to RTFOFF_MAX. */)
+        || *pcbSize >= RTFOFF_MAX - _1M
+        || *pcbSize < 0)
         return VERR_XAR_BAD_SIZE_ELEMENT;
     AssertCompile(RTFOFF_MAX == UINT64_MAX / 2);
@@ -446 +447 @@
             return VERR_XAR_BAD_LENGTH_ELEMENT;
 
-        rc = RTStrToUInt64Full(pszValue, 0, pcbLength);
+        rc = RTStrToInt64Full(pszValue, 0, pcbLength);
         if (   RT_FAILURE(rc)
             || rc == VWRN_NUMBER_TOO_BIG
-            || *pcbLength >= UINT64_MAX / 2 /* prevent overflow casting to RTFOFF_MAX. */)
+            || *pcbLength >= RTFOFF_MAX - _1M
+            || *pcbLength < 0)
             return VERR_XAR_BAD_LENGTH_ELEMENT;
         AssertCompile(RTFOFF_MAX == UINT64_MAX / 2);
@@ -840 +842 @@
     if (off == -1)
         off = pThis->offCurPos;
-    if (off < 0 || off > (RTFOFF)pThis->DataAttr.cbDataArchived)
+    if (off < 0 || off > pThis->DataAttr.cbDataArchived)
         return VERR_EOF;
     if (pThis->fEndOfStream)
     {
-        if (off >= (RTFOFF)pThis->DataAttr.cbDataArchived)
+        if (off >= pThis->DataAttr.cbDataArchived)
             return pcbRead ? VINF_EOF : VERR_EOF;
         if (!pThis->fSeekable)
@@ -852 +854 @@
 
     size_t cbToRead = pSgBuf->paSegs[0].cbSeg;
-    uint64_t cbLeft = (uint64_t)(pThis->DataAttr.cbDataArchived - off);
+    uint64_t cbLeft = pThis->DataAttr.cbDataArchived - off;
     if (cbToRead > cbLeft)
     {
@@ -897 +899 @@
      * Check for end of stream, also check the hash.
      */
-    if (pThis->offCurPos >= (RTFOFF)pThis->DataAttr.cbDataArchived)
+    if (pThis->offCurPos >= pThis->DataAttr.cbDataArchived)
     {
         Assert(pThis->offCurPos == pThis->DataAttr.cbDataArchived);
@@ -904 +906 @@
         /* Check hash. */
         if (   pThis->uHashState == RTZIPXAR_HASH_PENDING
-            && pThis->cbDigested == (RTFOFF)pThis->DataAttr.cbDataArchived)
+            && pThis->cbDigested == pThis->DataAttr.cbDataArchived)
         {
             RTZIPXARHASHDIGEST Digest;
@@ -1082 +1084 @@
     if (offSeek < 0)
         offSeek = 0;
-    else if (offSeek > (RTFOFF)pThis->Ios.DataAttr.cbDataArchived)
+    else if (offSeek > pThis->Ios.DataAttr.cbDataArchived)
         offSeek = pThis->Ios.DataAttr.cbDataArchived;
 
     /* Apply and return. */
-    pThis->Ios.fEndOfStream = (offSeek >= (RTFOFF)pThis->Ios.DataAttr.cbDataArchived);
+    pThis->Ios.fEndOfStream = (offSeek >= pThis->Ios.DataAttr.cbDataArchived);
     pThis->Ios.offCurPos    = offSeek;
     if (poffActual)
@@ -1191 +1193 @@
      * Enforce the cbDataExtracted limit.
      */
-    if (pThis->offCurPos > (RTFOFF)pThis->pIosRaw->DataAttr.cbDataExtracted)
+    if (pThis->offCurPos > pThis->pIosRaw->DataAttr.cbDataExtracted)
         return VERR_XAR_EXTRACTED_SIZE_EXCEEDED;
 
@@ -1213 +1215 @@
     if (rc == VINF_EOF)
     {
-        if (pThis->offCurPos == (RTFOFF)pThis->pIosRaw->DataAttr.cbDataExtracted)
+        if (pThis->offCurPos == pThis->pIosRaw->DataAttr.cbDataExtracted)
         {
             if (pThis->uHashState == RTZIPXAR_HASH_PENDING)
@@ -1237 +1239 @@
         if (RT_SUCCESS(rc))
         {
-            if (   pThis->pIosRaw->offCurPos < (RTFOFF)pThis->pIosRaw->DataAttr.cbDataArchived
+            if (   pThis->pIosRaw->offCurPos < pThis->pIosRaw->DataAttr.cbDataArchived
                 || pThis->pIosRaw->uHashState == RTZIPXAR_HASH_PENDING)
                 rc = VERR_XAR_UNUSED_ARCHIVED_DATA;
@@ -1812 +1814 @@
         {
             RTFOFF   offChecksum;
-            uint64_t cbChecksum;
+            RTFOFF   cbChecksum;
             rc = rtZipXarGetOffsetSizeLengthFromElem(pChecksumElem, &offChecksum, &cbChecksum, NULL);
             if (RT_FAILURE(rc))
                 return rc;
-            if (cbChecksum != pThis->cbHashDigest)
+            if (cbChecksum != (RTFOFF)pThis->cbHashDigest)
                 return VERR_XAR_BAD_DIGEST_LENGTH;
             if (offChecksum != 0 && pThis->hVfsFile == NIL_RTVFSFILE)
@@ -1822 +1824 @@
 
             RTZIPXARHASHDIGEST StoredDigest;
-            rc = RTVfsIoStrmReadAt(pThis->hVfsIos, pThis->offZero + offChecksum, &StoredDigest, cbChecksum,
+            rc = RTVfsIoStrmReadAt(pThis->hVfsIos, pThis->offZero + offChecksum, &StoredDigest, pThis->cbHashDigest,
                                    true /*fBlocking*/, NULL /*pcbRead*/);
             if (RT_FAILURE(rc))