aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2021-06-28 02:22:13 -0700
committerGuy Harris <gharris@sonic.net>2021-06-28 19:35:04 +0000
commit421c66dc445d648a1686f7ec226ad6f4c27cceac (patch)
tree671cc11c330fbf0b9958a8b4db6e49dc97195fb3
parent0a35a2e7f1713b8c02c09fd92b98fb8a3cb434d4 (diff)
downloadwireshark-421c66dc445d648a1686f7ec226ad6f4c27cceac.tar.gz
wireshark-421c66dc445d648a1686f7ec226ad6f4c27cceac.tar.bz2
wireshark-421c66dc445d648a1686f7ec226ad6f4c27cceac.zip
wireless_timeline: make sure the hash table is always allocated.
At least on my Mac, if I start up Wireshark, start a capture (non-monitor-mode) on the Wi-Fi adapter, add a comment to the SHB and the first packet while it's capturing, stop the capture, and try to save it, it warns that the wireless timeline hash table pointer is null. Allocate it in the constructor. (cherry picked from commit 693a02e76068de331c45df191f372ac14e6686d2)
-rw-r--r--ui/qt/widgets/wireless_timeline.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/widgets/wireless_timeline.cpp b/ui/qt/widgets/wireless_timeline.cpp
index e276bb2468..1e67d3a5fb 100644
--- a/ui/qt/widgets/wireless_timeline.cpp
+++ b/ui/qt/widgets/wireless_timeline.cpp
@@ -327,7 +327,7 @@ WirelessTimeline::WirelessTimeline(QWidget *parent) : QWidget(parent)
last = NULL;
capfile = NULL;
- radio_packet_list = NULL;
+ radio_packet_list = g_hash_table_new(g_direct_hash, g_direct_equal);
connect(wsApp, SIGNAL(appInitialized()), this, SLOT(appInitialized()));
}