Changeset 18347 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Mar 26, 2009 7:23:37 PM (16 years ago)

Author:

vboxsync

Message:

Storage/VMDK: fix reading certain VMDK files which have unusual quoting. The specs really leave a lot to be desired.

File:

• trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -1391 +1391 @@
     while (*pszStr == ' ' || *pszStr == '\t')
         pszStr++;
-    if (*pszStr++ != '"')
-        return vmdkError(pImage, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: incorrectly quoted value in descriptor in '%s'"), pImage->pszFilename);
-
-    pszQ = (char *)strchr(pszStr, '"');
-    if (pszQ == NULL)
-        return vmdkError(pImage, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: incorrectly quoted value in descriptor in '%s'"), pImage->pszFilename);
+
+    if (*pszStr != '"')
+    {
+        pszQ = (char *)pszStr;
+        while (*pszQ && *pszQ != ' ' && *pszQ != '\t')
+            pszQ++;
+    }
+    else
+    {
+        pszStr++;
+        pszQ = (char *)strchr(pszStr, '"');
+        if (pszQ == NULL)
+            return vmdkError(pImage, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: incorrectly quoted value in descriptor in '%s'"), pImage->pszFilename);
+    }
+
     pszUnquoted = (char *)RTMemTmpAlloc(pszQ - pszStr + 1);
     if (!pszUnquoted)