diff options
| author | Sake Blok <sake@euronet.nl> | 2022-02-27 15:35:58 +0100 |
|---|---|---|
| committer | Sake Blok <sake.blok@syn-bit.nl> | 2023-01-06 23:15:48 +0000 |
| commit | f870c6085dc3d34c68eae36b5d6de860c6a7b11a (patch) | |
| tree | fdfc7fe4f6cf332e658b8a6dea46d794ca898f77 /epan/packet.c | |
| parent | 693dc40936a9eeac0e1c10ff496b3d327e25642b (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/packet.c')
| -rw-r--r-- | epan/packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/packet.c b/epan/packet.c index c6378a5392..3275f8ed0c 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -445,11 +445,11 @@ free_data_sources(packet_info *pinfo) } void -mark_frame_as_depended_upon(packet_info *pinfo, guint32 frame_num) +mark_frame_as_depended_upon(frame_data *fd, guint32 frame_num) { /* Don't mark a frame as dependent on itself */ - if (frame_num != pinfo->num) { - pinfo->dependent_frames = g_slist_prepend(pinfo->dependent_frames, GUINT_TO_POINTER(frame_num)); + if (frame_num != fd->num) { + fd->dependent_frames = g_slist_prepend(fd->dependent_frames, GUINT_TO_POINTER(frame_num)); } } |