diff options
| author | Vasil Velichkov <vvvelichkov@gmail.com> | 2018-08-15 22:46:39 +0300 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-08-20 05:01:11 +0000 |
| commit | b7a6a11376c75f02b827a3dbd7598ecf419f6151 (patch) | |
| tree | c8ef569252d22c9b1ba554ee8cd2449172892e37 /ui/qt/sctp_chunk_statistics_dialog.h | |
| parent | aef622340967762e714b37286db9cf90385c17a2 (diff) | |
Qt: fix several crashes in the SCTP Dialogs
Store the association id instead of a pointer to the volatile
"sctp_assoc_info_t" structure because it gets freed after a rescan.
Bug: 14970
Change-Id: Id8fe2dfe3549bd711fc8ddef0770b217e83c2088
Fixes: v1.11.3-rc1-604-g796bf409b0 ("Add dialogs and graphs to analyse SCTP behavior similar to the GTK version.")
Reviewed-on: https://code.wireshark.org/review/28711
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/sctp_chunk_statistics_dialog.h')
| -rw-r--r-- | ui/qt/sctp_chunk_statistics_dialog.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/qt/sctp_chunk_statistics_dialog.h b/ui/qt/sctp_chunk_statistics_dialog.h index 3fdb2aae1f..09e254b6fd 100644 --- a/ui/qt/sctp_chunk_statistics_dialog.h +++ b/ui/qt/sctp_chunk_statistics_dialog.h @@ -24,8 +24,6 @@ #include <wsutil/filesystem.h> #include "wireshark_application.h" -#include "ui/tap-sctp-analysis.h" - #include <QTableWidgetItem> #include <QDialog> #include <QMenu> @@ -35,12 +33,14 @@ namespace Ui { class SCTPChunkStatisticsDialog; } +struct _sctp_assoc_info; + class SCTPChunkStatisticsDialog : public QDialog { Q_OBJECT public: - explicit SCTPChunkStatisticsDialog(QWidget *parent = 0, sctp_assoc_info_t *assoc = NULL, capture_file *cf = NULL); + explicit SCTPChunkStatisticsDialog(QWidget *parent = 0, const _sctp_assoc_info *assoc = NULL, capture_file *cf = NULL); ~SCTPChunkStatisticsDialog(); public slots: @@ -62,7 +62,7 @@ signals: private: Ui::SCTPChunkStatisticsDialog *ui; - sctp_assoc_info_t *selected_assoc; + guint16 selected_assoc_id; capture_file *cap_file_; QMenu ctx_menu_; QPoint selected_point; @@ -77,7 +77,7 @@ private: QMap<int, struct chunkTypes> chunks, tempChunks; void initializeChunkMap(); - void fillTable(bool all = false); + void fillTable(bool all = false, const _sctp_assoc_info *selected_assoc = NULL); }; #endif // SCTP_CHUNK_STATISTICS_DIALOG_H |