Changeset 17743 in vbox for trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

Timestamp:

Mar 12, 2009 1:18:06 PM (16 years ago)

Author:

vboxsync

Message:

VBoxBFE: Fixed segmentation fault when adding a directory instead of a file to HDA or HDB.

File:

• trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -1681 +1681 @@
             rc = CFGMR3InsertString(pCfg, "Format",       "SPF");                   UPDATE_RC();
         }
-        else if (!strcmp(RTPathExt(g_pszHdaFile), ".vdi"))
-        {
-            rc = CFGMR3InsertString(pCfg, "Format",       "VDI");                   UPDATE_RC();
-        }
         else
         {
-            rc = CFGMR3InsertString(pCfg, "Format",       "VMDK");                  UPDATE_RC();
+            char *pcExt = RTPathExt(g_pszHdaFile);
+            if ((pcExt) && (!strcmp(pcExt, ".vdi")))
+            {
+                rc = CFGMR3InsertString(pCfg, "Format",       "VDI");               UPDATE_RC();
+            }
+            else
+            {
+                rc = CFGMR3InsertString(pCfg, "Format",       "VMDK");              UPDATE_RC();
+            }
         }
     }
@@ -1708 +1712 @@
             rc = CFGMR3InsertString(pCfg, "Format",       "SPF");                   UPDATE_RC();
         }
-        else if (!strcmp(RTPathExt(g_pszHdbFile), ".vdi"))
-        {
-            rc = CFGMR3InsertString(pCfg, "Format",       "VDI");                   UPDATE_RC();
-        }
         else
         {
-            rc = CFGMR3InsertString(pCfg, "Format",       "VMDK");                  UPDATE_RC();
+            char *pcExt = RTPathExt(g_pszHdbFile);
+            if ((pcExt) && (!strcmp(pcExt, ".vdi")))
+            {
+                rc = CFGMR3InsertString(pCfg, "Format",       "VDI");               UPDATE_RC();
+            }
+            else
+            {
+                rc = CFGMR3InsertString(pCfg, "Format",       "VMDK");              UPDATE_RC();
+            }
         }
     }