Bug: 11715
Change-Id: I4a043c4a298506d51cb6bf8b97aac787113a7dfa
Reviewed-on: https://code.wireshark.org/review/11869
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guenter Ebermann <guenter.ebermann@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
}
g_free(secondary_msg);
*err = CANT_GET_INTERFACE_LIST;
- return NULL;
+ return if_list;
}
/* Split our lines */
{
int i;
- g_assert(has_wpcap);
-
- if (p_pcap_datalink_name_to_val != NULL)
+ if (has_wpcap && (p_pcap_datalink_name_to_val != NULL))
return p_pcap_datalink_name_to_val(name);
else {
/*
{
int i;
- g_assert(has_wpcap);
-
- if (p_pcap_datalink_val_to_name != NULL)
+ if (has_wpcap && (p_pcap_datalink_val_to_name != NULL))
return p_pcap_datalink_val_to_name(dlt);
else {
/*
{
int i;
- g_assert(has_wpcap);
-
- if (p_pcap_datalink_val_to_description != NULL)
+ if (has_wpcap && (p_pcap_datalink_val_to_description != NULL))
return p_pcap_datalink_val_to_description(dlt);
else {
/*