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

From Evan Huus: Two bad NULL checks in airpcap_loader.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7141 

svn path=/trunk/; revision=42136
This commit is contained in:
Anders Broman 2012-04-18 18:17:40 +00:00
parent 1cc3ca7aa1
commit 52e6a290c0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airpcap_loader.c
View File

@ -1336,6 +1336,9 @@ free_airpcap_if_cb(gpointer data, gpointer user_data _U_)
{
airpcap_if_info_t *if_info = data;
if (NULL == if_info)
return;
if (if_info->name != NULL)
g_free(if_info->name);
@ -1352,8 +1355,7 @@ free_airpcap_if_cb(gpointer data, gpointer user_data _U_)
if(if_info->ip_addr != NULL)
g_slist_free(if_info->ip_addr);
if(if_info != NULL)
g_free(if_info);
g_free(if_info);
}
/*
@ -1922,7 +1924,7 @@ get_wireshark_keys(void)
prefs_pref_foreach(wlan_prefs, get_wep_key, (gpointer)wep_user_data);
/* Copy the list field in the user data structure pointer into the final_list */
if(wep_user_data != NULL) wep_final_list = wep_user_data->list;
wep_final_list = wep_user_data->list;
/* XXX - Merge the three lists!!!!! */
final_list = wep_final_list;