Fix the leaking of packet comments, i.e. the rest of

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7530

The frame_data_cleanup function was ambiguous; it was being used for two
different purposes, and did neither of them quite properly. Split it instead
into frame_data_reset and frame_data_destroy, and call the correct one depending
on why we were originally calling frame_data_cleanup.

svn path=/trunk/; revision=48324

1 files changed, 2 insertions, 2 deletions

diff --git a/tshark.c b/tshark.c
index d36a815c2d..ba34eb0404 100644
--- a/tshark.c
+++ b/tshark.c
@@ -2677,7 +2677,7 @@ process_packet_first_pass(capture_file *cf,
   } else {
     /* if we don't add it to the frame_data_sequence, clean it up right now
      * to avoid leaks */
-    frame_data_cleanup(&fdlocal);
+    frame_data_destroy(&fdlocal);
     /* TODO, bug #8160 */
     /*
     prev_cap_frame = fdlocal;
@@ -3252,7 +3252,7 @@ process_packet(capture_file *cf, gint64 offset, struct wtap_pkthdr *whdr,
 
   if (do_dissection) {
     epan_dissect_cleanup(&edt);
-    frame_data_cleanup(&fdata);
+    frame_data_destroy(&fdata);
   }
   return passed;
 }