diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-04-18 18:17:40 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-04-18 18:17:40 +0000 |
| commit | 52e6a290c03b174ab157210c1ac68c036f6b72d7 (patch) | |
| tree | 07f6be013902415d3c3c1f080970bb801a22f124 /airpcap_loader.c | |
| parent | 1cc3ca7aa1528e3ade2bf9e9931163293b58c8f6 (diff) | |
| download | wireshark-52e6a290c03b174ab157210c1ac68c036f6b72d7.tar.gz | |
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
Diffstat (limited to 'airpcap_loader.c')
| -rw-r--r-- | airpcap_loader.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/airpcap_loader.c b/airpcap_loader.c index 537bdf289e..f20a88d401 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -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; |