From 888137161cd1e4fe48c56cd6681cae5c10deede2 Mon Sep 17 00:00:00 2001 From: Jirka Novak Date: Mon, 6 Jan 2020 23:59:29 +0100 Subject: voip_calls_dialog/voip_calls: Fix for duplicated entries after retap Issue seen from 2.6: 1) Open pcap with any VoIP call 2) Open Telephony->VoIP calls 3) Select one or more calls 4) Press Flow Sequence - sequence is shown 5) Close Flow Sequence 6) Press Play Streams - Play dialog is shown 7) Close Play dialog 8) Press Flow Sequence - sequence is shown, but all entries are duplicated If you repeat 6-7 multiple times, all entries are shown multiple times in 8 Patch adds missing clear of graph_analysis before retaping the stream. Tested on master, but should be backported to as many stable branches as possible. Change-Id: I9793f6e874defde2f377732d78689e957df71b33 Reviewed-on: https://code.wireshark.org/review/35672 Petri-Dish: Jim Young Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- ui/voip_calls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 6942c8154e..4b9e7b7419 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -571,6 +571,10 @@ rtp_reset(void *tap_offset_ptr) tapinfo->rtpstream_list = NULL; tapinfo->nrtpstreams = 0; + if (tapinfo->graph_analysis) { + sequence_analysis_list_free(tapinfo->graph_analysis); + } + if (tapinfo->tap_reset) { tapinfo->tap_reset(tapinfo); } -- cgit v1.2.3