path: root/file.c
diff options
authorStig Bjørlykke <stig@bjorlykke.org>2015-11-20 19:39:55 +0100
committerAnders Broman <a.broman58@gmail.com>2015-11-23 06:05:58 +0000
commit391f11a7ec16045ed5909d617edcaada1f8f9afc (patch)
tree09834ec2629d37179646bb3ec5e9fc46999b1c47 /file.c
parente36f987c51e6b6e35160ef8995dd1570dc6011fd (diff)
epan: Free pointers to deallocated memory
When redissecting packets we call epan_free() which deallocates wmem_file_scope memory. Such memory may be used in proto_data for the currently selected packet (cf->edt) and leaves pointers to deallocated memory (cf->edt->pi.fd->pfd). Free them after epan_free() to avoid unintended usage in packet_list_clear(). Bug: 11740 Change-Id: Ia3bc54f3f34e644a98b8a7eb1addd19b8aeeaab9 Reviewed-on: https://code.wireshark.org/review/11996 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'file.c')
1 files changed, 6 insertions, 0 deletions
diff --git a/file.c b/file.c
index e64cd18b7e..c552726c2e 100644
--- a/file.c
+++ b/file.c
@@ -1624,6 +1624,12 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, gb
/* 'reset' dissection session */
+ if (cf->edt && cf->edt->pi.fd) {
+ /* All pointers in "per frame proto data" for the currently selected
+ packet are allocated in wmem_file_scope() and deallocated in epan_free().
+ Free them here to avoid unintended usage in packet_list_clear(). */
+ frame_data_destroy(cf->edt->pi.fd);
+ }
cf->epan = ws_epan_new(cf);
cf->cinfo.epan = cf->epan;