Changeset 39049 in vbox

Timestamp:

Oct 20, 2011 9:39:22 AM (13 years ago)

Author:

vboxsync

Message:

IPRT: Implemented / adjusted zlib status code conversion.

Location:

trunk/src/VBox/Runtime/common/zip

Files:

• gzipvfs.cpp (modified) (1 diff)
• zip.cpp (modified) (8 diffs)

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

@@ -186 +186 @@
         case Z_BUF_ERROR:
             /* This isn't fatal. */
-            return VINF_SUCCESS;
-
-        case Z_ERRNO:
+            return VINF_SUCCESS; /** @todo The code in zip.cpp treats Z_BUF_ERROR as fatal... */
+
         case Z_STREAM_ERROR:
+            pThis->fFatalError = true;
+            return VERR_ZIP_CORRUPTED;
+
         case Z_DATA_ERROR:
+            pThis->fFatalError = true;
+            return pThis->fDecompress ? VERR_ZIP_CORRUPTED : VERR_ZIP_ERROR;
+
         case Z_MEM_ERROR:
+            pThis->fFatalError = true;
+            return VERR_ZIP_NO_MEMORY;
+
         case Z_VERSION_ERROR:
             pThis->fFatalError = true;
-            switch (rc)
-            {
-                case Z_ERRNO:           return VERR_INTERNAL_ERROR_5;
-                case Z_STREAM_ERROR:    return VERR_INTERNAL_ERROR_3;
-                case Z_DATA_ERROR:      return VERR_ZIP_ERROR;
-                case Z_MEM_ERROR:       return VERR_ZIP_NO_MEMORY;
-                case Z_VERSION_ERROR:   return VERR_ZIP_UNSUPPORTED_VERSION;
-            }
-            /* not reached */
-
+            return VERR_ZIP_UNSUPPORTED_VERSION;
+
+        case Z_ERRNO: /* We shouldn't see this status! */
         default:
+            AssertMsgFailed(("%d\n", rc));
             if (rc >= 0)
                 return VINF_SUCCESS;

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

@@ -420 +420 @@
  * Convert from zlib errno to iprt status code.
  * @returns iprt status code.
- * @param   rc      Zlib error code.
- */
-static int zipErrConvertFromZlib(int rc)
-{
-    /** @todo proper zlib error conversion. */
+ * @param   rc              Zlib error code.
+ * @param   fCompressing    Set if we're compressing, clear if decompressing.
+ */
+static int zipErrConvertFromZlib(int rc, bool fCompressing)
+{
     switch (rc)
     {
-        case Z_ERRNO:
-            return RTErrConvertFromErrno(errno);
+        case Z_OK:
+            return VINF_SUCCESS;
+
         case Z_STREAM_ERROR:
+            return VERR_ZIP_CORRUPTED;
+
         case Z_DATA_ERROR:
+            return fCompressing ? VERR_ZIP_ERROR : VERR_ZIP_CORRUPTED;
+
         case Z_MEM_ERROR:
+            return VERR_ZIP_NO_MEMORY;
+
         case Z_BUF_ERROR:
+            return VERR_ZIP_ERROR;
+
         case Z_VERSION_ERROR:
-            return VERR_GENERAL_FAILURE;
+            return VERR_ZIP_UNSUPPORTED_VERSION;
+
+        case Z_ERRNO: /* We shouldn't see this status! */
         default:
+            AssertMsgFailed(("%d\n", rc));
             if (rc >= 0)
                 return VINF_SUCCESS;
-            return VERR_GENERAL_FAILURE;
+            return VERR_ZIP_ERROR;
     }
 }
@@ -469 +481 @@
         int rc = deflate(&pZip->u.Zlib, Z_NO_FLUSH);
         if (rc != Z_OK)
-            return zipErrConvertFromZlib(rc);
+            return zipErrConvertFromZlib(rc, true /*fCompressing*/);
     }
     return VINF_SUCCESS;
@@ -502 +514 @@
         rc = deflate(&pZip->u.Zlib, Z_FINISH);
         if (rc != Z_OK && rc != Z_STREAM_END)
-            return zipErrConvertFromZlib(rc);
+            return zipErrConvertFromZlib(rc, true /*fCompressing*/);
     }
     return VINF_SUCCESS;
@@ -518 +530 @@
     int rc = deflateEnd(&pZip->u.Zlib);
     if (rc != Z_OK)
-        rc = zipErrConvertFromZlib(rc);
+        rc = zipErrConvertFromZlib(rc, true /*fCompressing*/);
     return rc;
 }
@@ -550 +562 @@
 
     int rc = deflateInit(&pZip->u.Zlib, enmLevel);
-    return rc >= 0 ? rc = VINF_SUCCESS : zipErrConvertFromZlib(rc);
+    return rc >= 0 ? rc = VINF_SUCCESS : zipErrConvertFromZlib(rc, true /*fCompressing*/);
 }
 
@@ -595 +607 @@
         }
         if (rc != Z_OK)
-            return zipErrConvertFromZlib(rc);
+            return zipErrConvertFromZlib(rc, false /*fCompressing*/);
     }
     return VINF_SUCCESS;
@@ -611 +623 @@
     int rc = inflateEnd(&pZip->u.Zlib);
     if (rc != Z_OK)
-        rc = zipErrConvertFromZlib(rc);
+        rc = zipErrConvertFromZlib(rc, false /*fCompressing*/);
     return rc;
 }
@@ -630 +642 @@
 
     int rc = inflateInit(&pZip->u.Zlib);
-    return rc >= 0 ? VINF_SUCCESS : zipErrConvertFromZlib(rc);
+    return rc >= 0 ? VINF_SUCCESS : zipErrConvertFromZlib(rc, false /*fCompressing*/);
 }