Changeset 63799 in vbox for trunk

Timestamp:

Sep 12, 2016 1:40:53 PM (8 years ago)

Author:

vboxsync

Message:

Storage/VMDK: Cleanup, get rid of goto... (part 1, build fix)

File:

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

trunk/src/VBox/Storage/VMDK.cpp

@@ -1850 +1850 @@
         if (cLine >= VMDK_DESCRIPTOR_LINES_MAX)
         {
-            rc = vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: descriptor too big in '%s'"), pImage->pszFilename);
+            vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: descriptor too big in '%s'"), pImage->pszFilename);
+            rc = VERR_VD_VMDK_INVALID_HEADER;
             break;
         }
@@ -1871 +1872 @@
             pszTmp++;
         }
+
+        if (RT_FAILURE(rc))
+            break;
+
         /* Get rid of LF character. */
         if (*pszTmp == '\n')