Free dynamic header fields on exit

Put routine to free all dynamically registered header fields in the
UAT reset callback to avoid ASAN report for memory leaks on exit.

Handle duplicated entries without leaking memory.

Call proto_free_deregistered_fields() in proto_cleanup() and move
this after prefs_cleanup() to free the memory used in UATs.

Change-Id: I96545177b5b23b9c20ad8e7751a0d5621c9ca10f
Reviewed-on: https://code.wireshark.org/review/27907
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

1 files changed, 12 insertions, 3 deletions

diff --git a/epan/epan.c b/epan/epan.c
index 3dfcde7c42..fe1f660c94 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -307,13 +307,22 @@ epan_cleanup(void)
 	epan_register_all_handoffs = NULL;
 
 	dfilter_cleanup();
-	proto_cleanup();
-	prefs_cleanup();
 	decode_clear_all();
+
+	/*
+	 * Note: packet_cleanup() will call registered shutdown routines which
+	 * may be used to deregister dynamically registered protocol fields,
+	 * and prefs_cleanup() will call uat_clear() which also may be used to
+	 * deregister dynamically registered protocol fields. This must be done
+	 * before proto_cleanup() to avoid inconsistency and memory leaks.
+	 */
+	packet_cleanup();
+	prefs_cleanup();
+	proto_cleanup();
+
 	conversation_filters_cleanup();
 	reassembly_table_cleanup();
 	tap_cleanup();
-	packet_cleanup();
 	expert_cleanup();
 	capture_dissector_cleanup();
 	export_pdu_cleanup();