aboutsummaryrefslogtreecommitdiffstats
path: root/epan/epan.c
diff options
context:
space:
mode:
authorSake Blok <sake@euronet.nl>2022-02-27 15:35:58 +0100
committerSake Blok <sake.blok@syn-bit.nl>2023-01-06 23:15:48 +0000
commitf870c6085dc3d34c68eae36b5d6de860c6a7b11a (patch)
treefdfc7fe4f6cf332e658b8a6dea46d794ca898f77 /epan/epan.c
parent693dc40936a9eeac0e1c10ff496b3d327e25642b (diff)
epan: Allow nested dependent packets
Save all dependent frames when there are multiple levels of reassembly. This is a retry of !6329, combined with the fix in !6509 which were reverted in !6545. epan: fix a segfault, introduced in !6329
Diffstat (limited to 'epan/epan.c')
-rw-r--r--epan/epan.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c
index a7ef10e85b..db3b8720a7 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -573,7 +573,6 @@ epan_dissect_reset(epan_dissect_t *edt)
wtap_block_unref(edt->pi.rec->block);
g_slist_free(edt->pi.proto_data);
- g_slist_free(edt->pi.dependent_frames);
/* Free the data sources list. */
free_data_sources(&edt->pi);
@@ -684,7 +683,6 @@ epan_dissect_cleanup(epan_dissect_t* edt)
g_slist_foreach(epan_plugins, epan_plugin_dissect_cleanup, edt);
g_slist_free(edt->pi.proto_data);
- g_slist_free(edt->pi.dependent_frames);
/* Free the data sources list. */
free_data_sources(&edt->pi);