diff options
author | Hadriel Kaplan <hadrielk@yahoo.com> | 2014-03-27 17:24:20 -0400 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-03-27 21:39:57 +0000 |
commit | ca9c160933919a85cd22dfd1784dcc04675fb72a (patch) | |
tree | 05817d85566dd325f3cbf07b5218d37782065e55 /ui/qt/packet_list_model.cpp | |
parent | 9a977fc8d03238f083760205be0d980dccaf3ee7 (diff) | |
download | wireshark-ca9c160933919a85cd22dfd1784dcc04675fb72a.tar.gz |
Fix bug9931 'Encapsulated ethernet packets sometimes show invalid FCS'
This fixes part-1 of bug9931: the uninitialized use of a wtap_pkthdr
struct. The second part of the bug deals with dissectors calling
the Ethernet dissector for ecnapsulated Ethernet packets but using
the wrong dissector handle to do so. That's unrelated to the issue this
commit addresses, so I'm splitting them up.
Change-Id: I87be7b736f82dd74d8c261062f88143372b5344c
Reviewed-on: https://code.wireshark.org/review/848
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/packet_list_model.cpp')
-rw-r--r-- | ui/qt/packet_list_model.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp index 14b88c9b80..a6b68f51bd 100644 --- a/ui/qt/packet_list_model.cpp +++ b/ui/qt/packet_list_model.cpp @@ -218,6 +218,8 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const else cinfo = NULL; + memset(&phdr, 0, sizeof(struct wtap_pkthdr)); + buffer_init(&buf, 1500); if (!cap_file_ || !cf_read_frame_r(cap_file_, fdata, &phdr, &buf)) { /* |