Qt: Use queued signals+slots for filter actions

Many of our dialogs can send an "apply this display filter" signal to
the main window. Applying a display filter in turn creates a nested
event loop via cf_read+update_progress_dlg. If the "apply" signal+slot
is directly connected (which is the default, and which means we're
calling into a function table) we can close the dialog while the signal
is firing, which means we return into a deleted object.

Make all of the filterAction signals+slots queued instead of direct.

Bug: 12523
Change-Id: Ica331054c0aa52a7f33bd8df1fa65ecd09fdc292
Reviewed-on: https://code.wireshark.org/review/16080
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 4d81268241..4e2e637d91 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -319,6 +319,12 @@ MainWindow::MainWindow(QWidget *parent) :
     main_ui_->actionAnalyzeReloadLuaPlugins->setVisible(false);
 #endif
 
+    qRegisterMetaType<FilterAction::Action>("FilterAction::Action");
+    qRegisterMetaType<FilterAction::ActionType>("FilterAction::ActionType");
+    connect(this, SIGNAL(filterAction(QString,FilterAction::Action,FilterAction::ActionType)),
+            this, SLOT(queuedFilterAction(QString,FilterAction::Action,FilterAction::ActionType)),
+            Qt::QueuedConnection);
+
     //To prevent users use features before initialization complete
     //Otherwise unexpected problems may occur
     setFeaturesEnabled(false);