summaryrefslogtreecommitdiff
path: root/ui/qt/capture_filter_combo.h
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2016-03-31 23:20:26 +0200
committerAnders Broman <a.broman58@gmail.com>2016-04-12 04:10:07 +0000
commitb7897ddecc673b6aad171564a38911e81fe29f39 (patch)
treedf2b2647f4d2e7567a4e4aca431e3b77645400b3 /ui/qt/capture_filter_combo.h
parentb49738e289b2aff4f4d661380bf6407d7b3a0e38 (diff)
downloadwireshark-b7897ddecc673b6aad171564a38911e81fe29f39.tar.gz
Qt: prevent input to the capture filter field during initialization
Mark the capture filter field as readonly until initialization is completed. This avoids useless entries in the recent capture filters list and fixes a use-after-free when typing during startup. (This use-after free occurred when a new item is added to the recent filters list which invalidates the previously retrieved list). Change-Id: Ifae9444986436a60781bf5f83a6e650501ccc4d5 Reviewed-on: https://code.wireshark.org/review/14740 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/capture_filter_combo.h')
-rw-r--r--ui/qt/capture_filter_combo.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/qt/capture_filter_combo.h b/ui/qt/capture_filter_combo.h
index 785b6ad36c..cc90a534f8 100644
--- a/ui/qt/capture_filter_combo.h
+++ b/ui/qt/capture_filter_combo.h
@@ -49,7 +49,8 @@ private:
CaptureFilterEdit *cf_edit_;
private slots:
- void rebuildFilterList(bool insert_edit_text = true);
+ void saveAndRebuildFilterList();
+ void rebuildFilterList();
};
#endif // CAPTURE_FILTER_COMBO_H