Changeset 16233 in vbox

Timestamp:

Jan 26, 2009 2:12:27 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42030

Message:

OVF: more lenient parsing of IDE disk correlation

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -693 +693 @@
                         // 12345678901234
                         if (i.strHostResource.substr(0, 11) == "ovf://disk/")
-                        {
                             vd.strDiskId = i.strHostResource.substr(11);
-                            if (m->mapDisks.find(vd.strDiskId) != m->mapDisks.end())
-                                fFound = true;
-                        }
-
-                        if (!fFound)
+                        else if (i.strHostResource.substr(0, 6) == "/disk/")
+                            vd.strDiskId = i.strHostResource.substr(6);
+
+                        if (    !(vd.strDiskId.length())
+                             || (m->mapDisks.find(vd.strDiskId) == m->mapDisks.end())
+                           )
                             return setError(VBOX_E_FILE_ERROR,
                                             tr("Error reading \"%s\": Hard disk item with instance ID %d specifies invalid host resource \"%s\", line %d"),