Changeset 101122 in vbox for trunk/src/VBox

Timestamp:

Sep 14, 2023 3:59:37 PM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: Fixing UINotificationCenter use-after-free revealed by asan; This was reproducible only for the case when keep finished progresses alive functionality is enabled.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter

Files:

• UINotificationCenter.cpp (modified) (2 diffs)
• UINotificationCenter.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.cpp

@@ -411 +411 @@
 
     /* Cleanup items first: */
-    cleanup();
+    cleanupItems();
 
     /* Populate model contents again: */
@@ -753 +753 @@
 }
 
-void UINotificationCenter::cleanup()
-{
-    /* Cleanup items: */
+void UINotificationCenter::cleanupModel()
+{
+    delete m_pModel;
+    m_pModel = 0;
+}
+
+void UINotificationCenter::cleanupItems()
+{
     qDeleteAll(m_items);
     m_items.clear();
+}
+
+void UINotificationCenter::cleanup()
+{
+    cleanupModel();
+    cleanupItems();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.h

@@ -163 +163 @@
     /** Prepares open-timer. */
     void prepareOpenTimer();
+    /** Cleanups model. */
+    void cleanupModel();
+    /** Cleanups items. */
+    void cleanupItems();
     /** Cleanups everything. */
     void cleanup();