summaryrefslogtreecommitdiffstats
path: root/epan/epan.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:44:25 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:44:25 +0000
commitf59ea5f7690c9a01ef6f7f6508084a66c40b1dae (patch)
tree482ee255d71f113be6c62e9ff3543fd6ebb9f12a /epan/epan.c
parentReleasing progress-linux version 4.2.2-1.1~progress7.99u1. (diff)
downloadwireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.tar.xz
wireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.zip
Merging upstream version 4.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/epan.c')
-rw-r--r--epan/epan.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/epan.c b/epan/epan.c
index f6659832..43d1f080 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -444,17 +444,17 @@ epan_cleanup(void)
except_deinit();
addr_resolv_cleanup();
-#ifdef HAVE_PLUGINS
- plugins_cleanup(libwireshark_plugins);
- libwireshark_plugins = NULL;
-#endif
-
if (pinfo_pool_cache != NULL) {
wmem_destroy_allocator(pinfo_pool_cache);
pinfo_pool_cache = NULL;
}
wmem_cleanup_scopes();
+
+#ifdef HAVE_PLUGINS
+ plugins_cleanup(libwireshark_plugins);
+ libwireshark_plugins = NULL;
+#endif
}
struct epan_session {