diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-10-01 16:56:01 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-01 20:46:50 +0000 |
| commit | b02a0ee48a51ccbb33ad76ce84ecb05409a6973a (patch) | |
| tree | ac9accb993abff51e62b671699a1e4afcfd11bac /ui/tap-rtp-common.c | |
| parent | ba5df1eea67b9e1cfde0a0d649d1b6db560fb745 (diff) | |
Fix crashes related to RTP Streams analysis
The data that describes RTP streams become invalid when packets are
re-dissected. This results in a crash in GTK when the "RTP Analyse"
option is used and and a crash in Qt when the display filter is changed
while the RTP Streams dialog is open.
Fix this by adding a tap_reset callback (modelled after mcaststream) to
the RTP tap listener that allows the GTK+ and Qt dialogs to clear the
displayed list of RTP streams.
Bug: 10016
Change-Id: I7478678db63d7ac8110c44c163844e9f66fad9e9
Reviewed-on: https://code.wireshark.org/review/10728
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/tap-rtp-common.c')
| -rw-r--r-- | ui/tap-rtp-common.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index f8d1e22280..f4a5b1aea3 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -101,7 +101,12 @@ void rtpstream_reset(rtpstream_tapinfo_t *tapinfo) void rtpstream_reset_cb(void *arg) { - rtpstream_reset((rtpstream_tapinfo_t *)arg); + rtpstream_tapinfo_t *ti =(rtpstream_tapinfo_t *)arg; + if (ti->tap_reset) { + /* Give listeners a chance to cleanup references. */ + ti->tap_reset(ti); + } + rtpstream_reset(ti); } /* |