Changeset 21848 in vbox

Timestamp:

Jul 28, 2009 2:45:02 PM (15 years ago)

Author:

vboxsync

Message:

zip.cpp: make sure we return VERR_NOT_SUPPORTED for attempts using compression types that aren't enabled in the build.

File:

• trunk/src/VBox/Runtime/common/misc/zip.cpp (modified) (13 diffs)

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

@@ -61 +61 @@
 #endif
 #ifdef RTZIP_USE_LZO
-#include <lzo/lzo1x.h>
+# include <lzo/lzo1x.h>
 #endif
 
@@ -259 +259 @@
 
 #ifdef RTZIP_USE_STORE
-#include <stdio.h>
 
 /**
@@ -417 +416 @@
 }
 
-#endif
+#endif /* RTZIP_USE_STORE */
 
 
@@ -635 +634 @@
 }
 
-#endif
+#endif /* RTZIP_USE_ZLIB */
 
 
@@ -858 +857 @@
 }
 
-#endif
+#endif /* RTZIP_USE_BZLIB */
 
 
@@ -1336 +1335 @@
      * Validate input.
      */
-    if (    enmType < RTZIPTYPE_AUTO
-        ||  enmType > RTZIPTYPE_LZF)
-    {
-        AssertMsgFailed(("Invalid enmType=%d\n", enmType));
-        return VERR_INVALID_PARAMETER;
-    }
-    if (    enmLevel < RTZIPLEVEL_STORE
-        ||  enmLevel > RTZIPLEVEL_MAX)
-    {
-        AssertMsgFailed(("Invalid enmLevel=%d\n", enmLevel));
-        return VERR_INVALID_PARAMETER;
-    }
-    if (!pfnOut || !ppZip)
-    {
-        AssertMsgFailed(("Must supply pfnOut and ppZip!\n"));
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertReturn(enmType >= RTZIPTYPE_INVALID && enmType < RTZIPTYPE_END, VERR_INVALID_PARAMETER);
+    AssertReturn(enmLevel >= RTZIPLEVEL_STORE && enmLevel <= RTZIPLEVEL_MAX, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pfnOut, VERR_INVALID_POINTER);
+    AssertPtrReturn(ppZip, VERR_INVALID_POINTER);
 
     /*
@@ -1392 +1378 @@
     pZip->pvUser  = pvUser;
     pZip->abBuffer[0] = enmType;       /* first byte is the compression type. */
-    int rc = VINF_SUCCESS;
+    int rc = VERR_NOT_IMPLEMENTED;
     switch (enmType)
     {
+        case RTZIPTYPE_STORE:
 #ifdef RTZIP_USE_STORE
-        case RTZIPTYPE_STORE:
             rc = rtZipStoreCompInit(pZip, enmLevel);
-            break;
-#endif
-
+#endif
+            break;
+
+        case RTZIPTYPE_ZLIB:
 #ifdef RTZIP_USE_ZLIB
-        case RTZIPTYPE_ZLIB:
             rc = rtZipZlibCompInit(pZip, enmLevel);
-            break;
-#endif
-
+#endif
+            break;
+
+        case RTZIPTYPE_BZLIB:
 #ifdef RTZIP_USE_BZLIB
-        case RTZIPTYPE_BZLIB:
             rc = rtZipBZlibCompInit(pZip, enmLevel);
-            break;
-#endif
-
+#endif
+            break;
+
+        case RTZIPTYPE_LZF:
 #ifdef RTZIP_USE_LZF
-        case RTZIPTYPE_LZF:
             rc = rtZipLZFCompInit(pZip, enmLevel);
-            break;
-#endif
+#endif
+            break;
+
+        case RTZIPTYPE_LZJB:
+        case RTZIPTYPE_LZO:
+            break;
 
         default:
-            AssertMsgFailed(("Not implemented!\n"));
-            rc = VERR_NOT_IMPLEMENTED;
-            break;
+            AssertFailedBreak();
     }
 
@@ -1520 +1508 @@
      * Validate input.
      */
-    if (!pfnIn || !ppZip)
-    {
-        AssertMsgFailed(("Must supply pfnIn and ppZip!\n"));
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertPtrReturn(pfnIn, VERR_INVALID_POINTER);
+    AssertPtrReturn(ppZip, VERR_INVALID_POINTER);
 
     /*
@@ -1567 +1552 @@
      */
     pZip->enmType = (RTZIPTYPE)u8Type;
+    rc = VERR_NOT_SUPPORTED;
     switch (pZip->enmType)
     {
+        case RTZIPTYPE_STORE:
 #ifdef RTZIP_USE_STORE
-        case RTZIPTYPE_STORE:
             rc = rtZipStoreDecompInit(pZip);
-            break;
-#endif
+#else
+            AssertMsgFailed(("Store is not include in this build!\n"));
+#endif
+            break;
 
         case RTZIPTYPE_ZLIB:
@@ -1579 +1567 @@
             rc = rtZipZlibDecompInit(pZip);
 #else
-            AssertMsgFailedReturn(("Zlib is not include in this build!\n"), VERR_NOT_IMPLEMENTED);
+            AssertMsgFailed(("Zlib is not include in this build!\n"));
 #endif
             break;
@@ -1587 +1575 @@
             rc = rtZipBZlibDecompInit(pZip);
 #else
-            AssertMsgFailedReturn(("BZlib is not include in this build!\n"), VERR_NOT_IMPLEMENTED);
+            AssertMsgFailed(("BZlib is not include in this build!\n"));
 #endif
             break;
@@ -1595 +1583 @@
             rc = rtZipLZFDecompInit(pZip);
 #else
-            AssertMsgFailedReturn(("LZF is not include in this build!\n"), VERR_NOT_IMPLEMENTED);
-#endif
-            break;
-
-        case RTZIPTYPE_INVALID:
-            AssertMsgFailed(("Invalid compression type RTZIPTYPE_INVALID!\n"));
-            rc = VERR_NOT_IMPLEMENTED;
-            break;
-
-        case RTZIPTYPE_AUTO:
-            AssertMsgFailed(("Invalid compression type RTZIPTYPE_AUTO!\n"));
-            rc = VERR_INVALID_MAGIC;
+            AssertMsgFailed(("LZF is not include in this build!\n"));
+#endif
+            break;
+
+        case RTZIPTYPE_LZJB:
+#ifdef RTZIP_USE_LZJB
+            AssertMsgFailed(("LZJB streaming support is not implemented yet!\n"));
+#else
+            AssertMsgFailed(("LZJB is not include in this build!\n"));
+#endif
+            break;
+
+        case RTZIPTYPE_LZO:
+#ifdef RTZIP_USE_LZJB
+            AssertMsgFailed(("LZO streaming support is not implemented yet!\n"));
+#else
+            AssertMsgFailed(("LZO is not include in this build!\n"));
+#endif
             break;
 
         default:
-            AssertMsgFailed(("Unknown compression type %d\n\n", pZip->enmType));
+            AssertMsgFailed(("Invalid compression type %d (%#x)!\n", pZip->enmType, pZip->enmType));
             rc = VERR_INVALID_MAGIC;
             break;
@@ -1622 +1616 @@
     return rc;
 }
+
 
 /**