From bd1e404c62e3e06a6d5e4f36ca5063ea51edcd87 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 1 Oct 2018 00:42:21 +0200 Subject: [PATCH] QUIC: fix trailing data after VN packet The returned offset must be non-zero or the data dissector is invoked. Change-Id: Iaff6e1f19fc94e17b41ad06a8be491fbec4835ba Fixes: v2.9.0rc0-1797-g91c5942c93 ("QUIC: implement packet coalescing (draft >= 11)") Reviewed-on: https://code.wireshark.org/review/29945 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-quic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index b38e8289f6..7c1695aa55 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -2218,7 +2218,7 @@ dissect_quic(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 long_packet_type = tvb_get_guint8(next_tvb, 0) & 0x7f; guint32 version = tvb_get_ntohl(next_tvb, 1); if (version == 0) { - dissect_quic_version_negotiation(next_tvb, pinfo, quic_tree, quic_packet); + offset += dissect_quic_version_negotiation(next_tvb, pinfo, quic_tree, quic_packet); break; } if (long_packet_type == QUIC_LPT_RETRY) { -- 2.34.1