summaryrefslogtreecommitdiff
path: root/epan/dissectors
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2015-02-16 22:32:25 -0500
committerAnders Broman <a.broman58@gmail.com>2015-02-17 12:18:14 +0000
commit0da88ba505188518a1b9ba055ccfc5e01d4ec505 (patch)
tree3c61132f2bd9a6f0a5c225d6d4617d90c476a829 /epan/dissectors
parent9150a928d522d30d6a7ab9756182c7bc12945707 (diff)
downloadwireshark-0da88ba505188518a1b9ba055ccfc5e01d4ec505.tar.gz
Don't send an effectively empty message (no TVBs) to the SCTP tap.
This prevents the tap from crashing (asserting out) because there's no (initialized) TVB to look at. Bug: 9849 Change-Id: I370a49ef32a67e504c30cf1762a2180bf13c56ca Reviewed-on: https://code.wireshark.org/review/7190 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-sctp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 52ee5b3d01..48962aa045 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -4636,7 +4636,7 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
SET_ADDRESS(&sctp_info.ip_dst, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data);
dissect_sctp_packet(tvb, pinfo, tree, FALSE);
- if (!pinfo->flags.in_error_pkt)
+ if (!pinfo->flags.in_error_pkt && sctp_info.number_of_tvbs > 0)
tap_queue_packet(sctp_tap, pinfo, &sctp_info);
}