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

Timestamp:

May 17, 2021 3:25:53 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: Guarding action pool pointer with QPointer to avoid crashes during vm close.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -1049 +1049 @@
     if (!panel)
         return;
+    if (!m_pActionPool)
+        return;
     if (panel->isVisible())
         panel->setVisible(false);

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -25 +25 @@
 #include <QKeySequence>
 #include <QPair>
+#include <QPointer>
 #include <QWidget>
 
@@ -207 +208 @@
     /** Holds the widget's embedding type. */
     const EmbedTo m_enmEmbedding;
-    /** Hold sthe action-pool reference. */
-    UIActionPool *m_pActionPool;
+    /** Holds the action-pool reference. Wrapped around with QPointer  to avoid use-after-delete case during vm window close.*/
+    QPointer<UIActionPool> m_pActionPool;
     /** Holds whether we should create/show toolbar. */
     const bool    m_fShowToolbar;