Changeset 33788 in vbox

Timestamp:

Nov 5, 2010 11:37:50 AM (14 years ago)

Author:

vboxsync

Message:

Main-OVF: one more error check; more specific error messages

File:

• trunk/src/VBox/Main/ApplianceImplImport.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -917 +917 @@
         size_t cbSize = 0;
         int vrc = RTSha1ReadBuf(strOvfFile.c_str(), &pvTmpBuf, &cbSize, pCallbacks, pStorage);
-        if (RT_FAILURE(vrc))
+        if (   RT_FAILURE(vrc)
+            || !pvTmpBuf)
             throw setError(VBOX_E_FILE_ERROR,
                            tr("Could not read OVF file '%s' (%Rrc)"),
@@ -1305 +1306 @@
                              tar, &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))
-            throw E_FAIL;
+            throw setError(E_FAIL,
+                           tr("Internal error (%Rrc)"), vrc);
 
         /* Skip the OVF file, cause this was read in IAppliance::Read already. */
         vrc = RTTarSeekNextFile(tar);
-        if (RT_FAILURE(vrc))
-            /* Better error .... no unusual error */
-            throw E_FAIL;
+        if (   RT_FAILURE(vrc)
+            && vrc != VERR_TAR_END_OF_FILE)
+            throw setError(E_FAIL,
+                           tr("Internal error (%Rrc)"), vrc);
 
         PVDINTERFACEIO pCallbacks = pRTSha1Callbacks;