diff options
author | Evan Huus <eapache@gmail.com> | 2013-08-13 22:41:34 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-08-13 22:41:34 +0000 |
commit | d8f00e22e117477ac7be2bd55b077aab63f8cb89 (patch) | |
tree | 8e56c2d68d2bec913bb8f9b0b59d3a9251b120ab /tshark.c | |
parent | 1eab806d9bb46fde55eb07a9fe92d568cb1f8112 (diff) |
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
Diffstat (limited to 'tshark.c')
-rw-r--r-- | tshark.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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); |