diff options
author | Peter Wu <peter@lekensteyn.nl> | 2018-01-23 17:56:42 +0100 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2018-02-14 08:03:10 +0000 |
commit | 9198448f9db7b77af8d19f8265d6785fb005dc58 (patch) | |
tree | 8ec8f7bfff3f106cff9987807bff644fe4aad949 /ui/qt/byte_view_tab.h | |
parent | f0db412f57effe6234edc78e1f438b735efae805 (diff) |
Qt: fix crash in packet dialog on changing selection
"((capture_file_t *)cap_file_)->edt" is documented in cfile.h to cover
the currently selected packet (in the packet list). But in the packet
dialog, the packet selection is irrelevant and the data from a different
dissection tree must be used.
Change-Id: Ieaea3cf862d47540e7f6b6c84c1a2fa6945a877b
Fixes: v2.5.0rc0-1532-g56a130a152 ("ByteViewText: Remove epan dependancy")
Bug: 14246
Reviewed-on: https://code.wireshark.org/review/25437
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt/byte_view_tab.h')
-rw-r--r-- | ui/qt/byte_view_tab.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/qt/byte_view_tab.h b/ui/qt/byte_view_tab.h index b3144f2886..915d084634 100644 --- a/ui/qt/byte_view_tab.h +++ b/ui/qt/byte_view_tab.h @@ -29,7 +29,7 @@ class ByteViewTab : public QTabWidget Q_OBJECT public: - explicit ByteViewTab(QWidget *parent = 0); + explicit ByteViewTab(QWidget *parent = 0, epan_dissect_t *edt_fixed = 0); public slots: /* Set the capture file */ @@ -47,6 +47,10 @@ signals: private: capture_file *cap_file_; + bool is_fixed_packet_; /* true if this byte view is related to a single + packet in the packet dialog and false if the + packet dissection context can change. */ + epan_dissect_t *edt_; /* Packet dissection result for the currently selected packet. */ void setTabsVisible(); ByteViewText * findByteViewTextForTvb(tvbuff_t * search, int * idx = 0); |