diff options
| author | Ahmad Fatoum <ahmad@a3f.at> | 2017-08-26 10:30:47 +0200 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-10-15 12:38:51 +0000 |
| commit | 9d49e1316689ae05d31efc866f04ac12cd051085 (patch) | |
| tree | f51b835fd490fe6be49268a114014f597f47c252 /caputils | |
| parent | 37ccb77a1ab845075465c2d86eea9e8e21abc273 (diff) | |
Remove superfluous null-checks before strdup/free
NULL checks were removed for following free functions:
- g_free "If mem is NULL it simply returns"
https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html#g-free
- g_slist_free(_full)? "NULL is considered to be the empty list"
https://developer.gnome.org/glib/stable/glib-Singly-Linked-Lists.html
- g_strfreev "If str_array is NULL, this function simply returns."
https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strfreev
- g_slice_free "If mem is NULL, this macro does nothing."
https://developer.gnome.org/glib/stable/glib-Memory-Slices.html#g-slice-free
- g_match_info_free "not NULL... otherwise does nothing"
https://developer.gnome.org/glib/stable/glib-Perl-compatible-regular-expressions.html#g-match-info-free
- dfilter_free defined in Wireshark code. Returns early when passed NULL
epan/dfilter/dfilter.c
They were also removed around calls to g_strdup where applicable:
- g_strdup "If str is NULL it returns NULL."
https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strdup
Change-Id: Ie80c2db89bef531edc3aed7b7c9f654e1d654d04
Reviewed-on: https://code.wireshark.org/review/23406
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/airpcap_loader.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index 1d290b4edd..8896bf02e0 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -780,11 +780,9 @@ free_airpcap_if_cb(gpointer data, gpointer user_data _U_) if (NULL == if_info) return; - if (if_info->name != NULL) - g_free(if_info->name); + g_free(if_info->name); - if (if_info->description != NULL) - g_free(if_info->description); + g_free(if_info->description); /* XXX - FREE THE WEP KEY LIST HERE!!!*/ if (if_info->keysCollection != NULL) @@ -793,8 +791,7 @@ free_airpcap_if_cb(gpointer data, gpointer user_data _U_) if_info->keysCollection = NULL; } - if (if_info->ip_addr != NULL) - g_slist_free(if_info->ip_addr); + g_slist_free(if_info->ip_addr); g_free(if_info); } @@ -1107,11 +1104,9 @@ airpcap_if_info_free(airpcap_if_info_t *if_info) { if (if_info != NULL) { - if (if_info->name != NULL) - g_free(if_info->name); + g_free(if_info->name); - if (if_info->description != NULL) - g_free(if_info->description); + g_free(if_info->description); if (if_info->keysCollection != NULL) { @@ -1125,10 +1120,7 @@ airpcap_if_info_free(airpcap_if_info_t *if_info) if_info->ip_addr = NULL; } - if (if_info != NULL) - { - g_free(if_info); - } + g_free(if_info); } } |