summaryrefslogtreecommitdiff
path: root/ui/mcast_stream.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-08-24 10:29:18 +0200
committerAnders Broman <a.broman58@gmail.com>2015-08-25 10:57:03 +0000
commitcc15b11883238938eb354e81583433cd789a4243 (patch)
tree4145ee1515da7ce25fd9636a5bd3dd6f2321594f /ui/mcast_stream.c
parent31bf40eacfbd9bab69c3da9f6989ac70ba5c2490 (diff)
downloadwireshark-cc15b11883238938eb354e81583433cd789a4243.tar.gz
Multicast Stream: Fix Dereference of null pointer found by Clang analyzer
Change-Id: I419f49132f8b0853c17b2fd1b4e9869ef3fafd13 Reviewed-on: https://code.wireshark.org/review/10224 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/mcast_stream.c')
-rw-r--r--ui/mcast_stream.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c
index 0a0790038f..24546c6584 100644
--- a/ui/mcast_stream.c
+++ b/ui/mcast_stream.c
@@ -119,10 +119,12 @@ static void
mcaststream_reset_cb(void *ti_ptr)
{
mcaststream_tapinfo_t *tapinfo = (mcaststream_tapinfo_t *)ti_ptr;
- if (tapinfo && tapinfo->tap_reset) {
- tapinfo->tap_reset(ti_ptr);
+ if (tapinfo) {
+ if (tapinfo->tap_reset) {
+ tapinfo->tap_reset(ti_ptr);
+ }
+ mcaststream_reset(tapinfo);
}
- mcaststream_reset(tapinfo);
}
/****************************************************************************/