osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Calling g_hash_table_size with a NULL argument causes a GLib-CRITICAL. 

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 <jmayer@loplof.de>
This commit is contained in:
Joerg Mayer 2017-02-20 21:44:27 +01:00 committed by Jörg Mayer
parent 124807e59d
commit b82f7c5b7d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/remote_capture_dialog.cpp
View File

@ -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")));

4
ui/recent.c
View File

@ -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);
}