diff options
| author | Dario Lombardo <lomato@gmail.com> | 2017-02-04 16:26:34 +0100 |
|---|---|---|
| committer | Dario Lombardo <lomato@gmail.com> | 2017-02-14 10:22:20 +0000 |
| commit | 7c0c580c4b0093437ee81e11934ef5b8d27a5bb4 (patch) | |
| tree | 45d46758e2ce26b82b8a5d066bd9b1f23e1165ec /capture_opts.c | |
| parent | ae0bdcc78c6cb2719e7aa5ae24e80584dec488a3 (diff) | |
wiretap: add cleanup routine.
The cleanup routine has been added to exit section of the applications.
Those which required a exit restyle have been patched as well.
Change-Id: I3a8787f0718ac7fef00dc58176869c7510fda7b1
Reviewed-on: https://code.wireshark.org/review/19949
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Diffstat (limited to 'capture_opts.c')
| -rw-r--r-- | capture_opts.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/capture_opts.c b/capture_opts.c index 93cea2ab77..3b0f77c99e 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -124,8 +124,17 @@ capture_opts_init(capture_options *capture_opts) void capture_opts_cleanup(capture_options *capture_opts) { - g_array_free(capture_opts->ifaces, TRUE); - g_array_free(capture_opts->all_ifaces, TRUE); + if (!capture_opts) + return; + + if (capture_opts->ifaces) { + g_array_free(capture_opts->ifaces, TRUE); + capture_opts->ifaces = NULL; + } + if (capture_opts->all_ifaces) { + g_array_free(capture_opts->all_ifaces, TRUE); + capture_opts->all_ifaces = NULL; + } } /* log content of capture_opts */ |