diff options
author | Evan Huus <eapache@gmail.com> | 2013-03-15 18:04:50 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-03-15 18:04:50 +0000 |
commit | 32799db42c65f2aa0d9b30212a2bde20b9d96d41 (patch) | |
tree | 57eb7c019916f4fc52ce819fe0ada718ba5beed1 /tshark.c | |
parent | 574d1ceec3c1b9fae918888d18146ac11ca992e0 (diff) |
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
Diffstat (limited to 'tshark.c')
-rw-r--r-- | tshark.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; } |