diff options
| author | Dario Lombardo <lomato@gmail.com> | 2017-02-20 14:42:42 +0100 |
|---|---|---|
| committer | Dario Lombardo <lomato@gmail.com> | 2017-02-22 15:20:38 +0000 |
| commit | 68f94bd91876721c59b5df417463f067f0a13a02 (patch) | |
| tree | 6a6065714feb4d81a2fed44fb74cdf52939903a5 | |
| parent | 955cf0ba370494ecbf4ec9e0e81e1c02966d0b53 (diff) | |
| download | wireshark-68f94bd91876721c59b5df417463f067f0a13a02.tar.gz | |
mergecap: free memory on shutdown.
Change-Id: I65445cca6b16f750bf3a98fdfea228a51b46106c
Reviewed-on: https://code.wireshark.org/review/20203
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
| -rw-r--r-- | mergecap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mergecap.c b/mergecap.c index 41339a4e61..50362186d0 100644 --- a/mergecap.c +++ b/mergecap.c @@ -485,6 +485,10 @@ main(int argc, char *argv[]) clean_exit: wtap_cleanup(); + free_progdirs(); +#ifdef HAVE_PLUGINS + plugins_cleanup(); +#endif return (status == MERGE_OK) ? 0 : 2; } |