From b82f7c5b7d30241dd190cd243111b224c2813c90 Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Mon, 20 Feb 2017 21:44:27 +0100 Subject: Calling g_hash_table_size with a NULL argument causes a GLib-CRITICAL. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the first issue appearing in the log of Bug: 13418 Change-Id: I2fe68a06dd4a19be8300ec34be65a8dc47d0f8b3 Reviewed-on: https://code.wireshark.org/review/20214 Reviewed-by: Jörg Mayer --- ui/qt/remote_capture_dialog.cpp | 2 +- ui/recent.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/qt/remote_capture_dialog.cpp b/ui/qt/remote_capture_dialog.cpp index 81cd455183..98cc35ed10 100644 --- a/ui/qt/remote_capture_dialog.cpp +++ b/ui/qt/remote_capture_dialog.cpp @@ -84,7 +84,7 @@ void RemoteCaptureDialog::fillComboBox() { GHashTable *ht = get_remote_host_list(); ui->hostCombo->addItem(QString("")); - if (g_hash_table_size(ht) > 0) { + if (recent_get_remote_host_list_size() > 0) { g_hash_table_foreach(ht, fillBox, ui->hostCombo); ui->hostCombo->insertSeparator(g_hash_table_size(ht)+1); ui->hostCombo->addItem(QString(tr("Clear list"))); diff --git a/ui/recent.c b/ui/recent.c index b95ee65eb6..01204f5d72 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -384,6 +384,10 @@ static GHashTable *remote_host_list=NULL; int recent_get_remote_host_list_size(void) { + if (remote_host_list == NULL) { + /* No entries exist. */ + return 0; + } return g_hash_table_size (remote_host_list); } -- cgit v1.2.3