Changeset 19256 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 29, 2009 11:08:16 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: VBoxMediaComboBox crash vulnerability of empty combo-box fixed.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaComboBox.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaComboBox.cpp

@@ -102 +102 @@
 QString VBoxMediaComboBox::id (int aIndex /*= -1*/) const
 {
-    QString uuidNull; /* gcc-3.3 hack */
-    AssertReturn (aIndex == -1 ||
-                  (aIndex >= 0 && aIndex < mMedia.size()),
-                  uuidNull);
-
-    return mMedia [aIndex == -1 ? currentIndex() : aIndex].id;
-}
-
-QString VBoxMediaComboBox::location (int aIndex /*= -1*/) const
-{
     AssertReturn (aIndex == -1 ||
                   (aIndex >= 0 && aIndex < mMedia.size()),
                   QString::null);
 
-    return mMedia [aIndex == -1 ? currentIndex() : aIndex].location;
+    if (aIndex == -1) aIndex = currentIndex();
+    return aIndex == -1 ? QString::null : mMedia [aIndex].id;
+}
+
+QString VBoxMediaComboBox::location (int aIndex /*= -1*/) const
+{
+    AssertReturn (aIndex == -1 ||
+                  (aIndex >= 0 && aIndex < mMedia.size()),
+                  QString::null);
+
+    if (aIndex == -1) aIndex = currentIndex();
+    return aIndex == -1 ? QString::null : mMedia [aIndex].location;
 }