As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9033

Make epan_free a no-op if the pointer is NULL. This fixes 99% of the cases
causing problems for wmem_leave_file_scope() - remove that XXX comment and add
back the assertion.

Remove the cleanup_dissection call from epan_cleanup, it doesn't make sense
there. init_dissection is only called from epan_new, so cleanup_dissection
should only be called from epan_free.

Add one missing epan_free call to tshark revealed by the above changes.

svn path=/trunk/; revision=51342

1 files changed, 1 insertions, 0 deletions

diff --git a/tshark.c b/tshark.c
index 049c2c2577..f996929a24 100644
--- a/tshark.c
+++ b/tshark.c
@@ -2084,6 +2084,7 @@ main(int argc, char *argv[])
 
   draw_tap_listeners(TRUE);
   funnel_dump_all_text_windows();
+  epan_free(cfile.epan);
   epan_cleanup();
 
   output_fields_free(output_fields);