From 68f94bd91876721c59b5df417463f067f0a13a02 Mon Sep 17 00:00:00 2001
From: Dario Lombardo <lomato@gmail.com>
Date: Mon, 20 Feb 2017 14:42:42 +0100
Subject: [PATCH] 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>
---
 mergecap.c | 4 ++++
 1 file changed, 4 insertions(+)

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;
 }
 
-- 
2.34.1