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 /epan/frame_data.h | |
| parent | 574d1ceec3c1b9fae918888d18146ac11ca992e0 (diff) | |
| download | wireshark-32799db42c65f2aa0d9b30212a2bde20b9d96d41.tar.gz | |
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 'epan/frame_data.h')
| -rw-r--r-- | epan/frame_data.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/frame_data.h b/epan/frame_data.h index acda8d5d99..94bc7404dd 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -97,7 +97,9 @@ void p_remove_proto_data(frame_data *fd, int proto); /** compare two frame_datas */ WS_DLL_PUBLIC gint frame_data_compare(const frame_data *fdata1, const frame_data *fdata2, int field); -WS_DLL_PUBLIC void frame_data_cleanup(frame_data *fdata); +WS_DLL_PUBLIC void frame_data_reset(frame_data *fdata); + +WS_DLL_PUBLIC void frame_data_destroy(frame_data *fdata); WS_DLL_PUBLIC void frame_data_init(frame_data *fdata, guint32 num, const struct wtap_pkthdr *phdr, gint64 offset, |