From 6a388bbf278c4da8b75e647cb554236ca03fcd1e Mon Sep 17 00:00:00 2001 From: jake Date: Fri, 27 May 2011 07:02:26 +0000 Subject: [PATCH] From Colin O'Flynn: Avoid processing tvb when fragment dissection didn't create one. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37426 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-6lowpan.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 031dcfb93f..76a9757005 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -2035,6 +2035,11 @@ dissect_6lowpan_frag_first(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return NULL; } + /* Check call to dissect_6lowpan_xxx was successful */ + if (frag_tvb == NULL) { + return NULL; + } + /* Add this datagram to the fragment table. */ frag_size = tvb_length(frag_tvb); tvb_set_reported_length(frag_tvb, frag_size); -- 2.34.1