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 /wiretap/file_access.c | |
| 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 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index ce9195fd57..8740756df2 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -523,8 +523,7 @@ wtap_deregister_open_info(const gchar *name) for (i = 0; i < open_info_arr->len; i++) { if (open_routines[i].name && strcmp(open_routines[i].name, name) == 0) { - if (open_routines[i].extensions_set != NULL) - g_strfreev(open_routines[i].extensions_set); + g_strfreev(open_routines[i].extensions_set); open_info_arr = g_array_remove_index(open_info_arr, i); set_heuristic_routine(); return; @@ -2590,8 +2589,7 @@ wtap_dump_close(wtap_dumper *wdh, int *err) } ret = FALSE; } - if (wdh->priv != NULL) - g_free(wdh->priv); + g_free(wdh->priv); wtap_block_array_free(wdh->interface_data); g_free(wdh); return ret; |