diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-02-25 19:23:39 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-02-25 23:08:45 +0000 |
| commit | d464d9cb5c94003f2a0938ab05d6a184dc2a8b94 (patch) | |
| tree | ffdf3d9c8c2dcfb9d2d0be43590bf4be21c3c785 /ui/qt/wireshark_application.cpp | |
| parent | cd7d159c2ee180be6654a7acbf7c83f902216462 (diff) | |
| download | wireshark-d464d9cb5c94003f2a0938ab05d6a184dc2a8b94.tar.gz | |
Revert "Qt: call cleanup from destructor in WiresharkApplication."
Calling cleanup() twice (via exit signal and via destructor) results in a
use-after-free on exit via write_profile_recent.
This reverts commit e47f9fbeb090a68f9229b0f03c3f76a6285d2dff.
Change-Id: Ic3ca0742c03a345fd8cb7f3f782942872a3057f5
Reviewed-on: https://code.wireshark.org/review/20273
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/wireshark_application.cpp')
| -rw-r--r-- | ui/qt/wireshark_application.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index 541c560fe2..e301cc2bf9 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -672,7 +672,6 @@ void WiresharkApplication::cleanup() qDeleteAll(recent_captures_); recent_captures_.clear(); - free_filter_lists(); } void WiresharkApplication::itemStatusFinished(const QString filename, qint64 size, bool accessible) { @@ -848,7 +847,7 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) : WiresharkApplication::~WiresharkApplication() { - this->cleanup(); + free_filter_lists(); } void WiresharkApplication::registerUpdate(register_action_e action, const char *message) |