Changeset 33757 in vbox

Timestamp:

Nov 4, 2010 10:25:18 AM (14 years ago)

Author:

vboxsync

Message:

Storage/RAW: case insensitive extension matching
Main/Medium: For detection failures don't trigger an assertion which in strict builds lead to a crash. The error message is good enough.

Location:

trunk/src/VBox

Files:

• Main/MediumImpl.cpp (modified) (1 diff)
• Storage/RAW.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -3693 +3693 @@
                 }
             }
-            else if (m->devType != convertToDeviceType(enmType))
+            else if (   enmType == VDTYPE_INVALID
+                     || m->devType != convertToDeviceType(enmType))
             {
                 /*

trunk/src/VBox/Storage/RAW.cpp

@@ -548 +548 @@
         && pszExtension)
     {
-        if (!strcmp(pszExtension, ".iso")) /* DVD images. */
+        if (!RTStrICmp(pszExtension, ".iso")) /* DVD images. */
         {
             if (cbFile >= (32768 + sizeof(ISOVOLDESC)))
@@ -578 +578 @@
             }
         }
-        else if (!strcmp(pszExtension, ".img") || !strcmp(pszExtension, ".ima")) /* Floppy images */
+        else if (!RTStrICmp(pszExtension, ".img") || !RTStrICmp(pszExtension, ".ima")) /* Floppy images */
         {
             if (!(cbFile % 512))