Changeset 37246 in vbox for trunk/src/VBox/Storage/VMDK.cpp

Timestamp:

May 30, 2011 8:33:24 AM (14 years ago)

Author:

vboxsync

Message:

Storage/VMDK+VDI: fix error handling when pointing to a zero size file

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2704 +2704 @@
     if (RT_FAILURE(rc))
     {
-        rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error reading extent header in '%s'"), pExtent->pszFullname);
+        vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error reading extent header in '%s'"), pExtent->pszFullname);
+        rc = VERR_VD_VMDK_INVALID_HEADER;
         goto out;
     }
@@ -2742 +2743 @@
         if (RT_FAILURE(rc))
         {
-            rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error reading extent footer in '%s'"), pExtent->pszFullname);
+            vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error reading extent footer in '%s'"), pExtent->pszFullname);
+            rc = VERR_VD_VMDK_INVALID_HEADER;
             goto out;
         }
@@ -3025 +3027 @@
     AssertRC(rc);
     if (RT_FAILURE(rc))
-        goto out;
+    {
+        vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error reading ESX sparse extent header in '%s'"), pExtent->pszFullname);
+        rc = VERR_VD_VMDK_INVALID_HEADER;
+        goto out;
+    }
     if (    RT_LE2H_U32(Header.magicNumber) != VMDK_ESX_SPARSE_MAGICNUMBER
         ||  RT_LE2H_U32(Header.version) != 1
@@ -3240 +3246 @@
     if (RT_FAILURE(rc))
     {
-        rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error reading the magic number in '%s'"), pImage->pszFilename);
+        vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error reading the magic number in '%s'"), pImage->pszFilename);
+        rc = VERR_VD_VMDK_INVALID_HEADER;
         goto out;
     }