Changeset 75191 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 30, 2018 4:54:34 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: UIActionPoolRuntime: Prevent theoretically possible crash (like the one mentioned in r126267) if menu update handler belongs to base-class, not inherited one.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIActionPool.cpp (modified) (1 diff)
• UIActionPoolRuntime.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -2354 +2354 @@
 void UIActionPool::updateMenu(int iIndex)
 {
-    /* Update if menu with such index is invalidated and there is update-handler: */
-    if (m_invalidations.contains(iIndex) && m_menuUpdateHandlers.contains(iIndex))
+    /* Make sure index belongs to this class: */
+    AssertReturnVoid(iIndex < UIActionIndex_Max);
+
+    /* If menu with such index is invalidated
+     * and there is update-handler => handle it here: */
+    if (   m_invalidations.contains(iIndex)
+        && m_menuUpdateHandlers.contains(iIndex))
         (this->*(m_menuUpdateHandlers.value(iIndex).ptf))();
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp

@@ -3506 +3506 @@
 void UIActionPoolRuntime::updateMenu(int iIndex)
 {
-    /* Call to base-class: */
+    /* If index belongs to base-class => delegate to base-class: */
     if (iIndex < UIActionIndex_Max)
         UIActionPool::updateMenu(iIndex);
-
-    /* If menu with such index is invalidated and there is update-handler: */
-    if (m_invalidations.contains(iIndex) && m_menuUpdateHandlers.contains(iIndex))
-        (this->*(m_menuUpdateHandlers.value(iIndex).ptfr))();
+    /* Otherwise,
+     * if menu with such index is invalidated
+     * and there is update-handler => handle it here: */
+    else if (   iIndex > UIActionIndex_Max
+             && m_invalidations.contains(iIndex)
+             && m_menuUpdateHandlers.contains(iIndex))
+             (this->*(m_menuUpdateHandlers.value(iIndex).ptfr))();
 }