diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2019-06-12 15:30:08 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-06-13 05:37:50 +0000 |
| commit | b147cbfc6c10dec98636fdceb15c02c12348380c (patch) | |
| tree | 5b532364fd28d01b04a8cd9cfc93d39846a9d008 /ui | |
| parent | 3b9397dd8bfe83b0f60bcd4ed75f2661309c384a (diff) | |
Qt: traffic table: remove file_closed_
Remove the file_closed_ member from class TrafficTableDialog. We already
have a file_closed_ variable in the base class WiresharkDialog, which is
updated correctly when the file is closed.
The shadow file_closed_ variable in TrafficTableDialog is always false.
Classes that are derived from TrafficTableDialog will not see that the
capture file was closed.
The following scenario crashes Wireshark because of this bug
* open a capture file with TCP traffic
* Statistics / Conversations
* select a TCP conversation
* close the capture file
* press the Follow Stream button in the Conversations dialog
-> Wireshark crashes
Change-Id: I8f3d55f231eae5ecc682ff90650f0005fea4b333
Reviewed-on: https://code.wireshark.org/review/33578
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/traffic_table_dialog.cpp | 1 | ||||
| -rw-r--r-- | ui/qt/traffic_table_dialog.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp index 02a6a67fa3..f2cd5799fa 100644 --- a/ui/qt/traffic_table_dialog.cpp +++ b/ui/qt/traffic_table_dialog.cpp @@ -44,7 +44,6 @@ TrafficTableDialog::TrafficTableDialog(QWidget &parent, CaptureFile &cf, const c WiresharkDialog(parent, cf), ui(new Ui::TrafficTableDialog), cap_file_(cf), - file_closed_(false), filter_(filter), nanosecond_timestamps_(false) { diff --git a/ui/qt/traffic_table_dialog.h b/ui/qt/traffic_table_dialog.h index 755c2f5f4c..2e6a7a2600 100644 --- a/ui/qt/traffic_table_dialog.h +++ b/ui/qt/traffic_table_dialog.h @@ -124,7 +124,6 @@ protected: Ui::TrafficTableDialog *ui; CaptureFile &cap_file_; - bool file_closed_; QString filter_; QMenu traffic_type_menu_; QPushButton *copy_bt_; |