aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-6lowpan.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2011-05-27 07:02:26 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2011-05-27 07:02:26 +0000
commit8e30d1990e8535b416382d88b866d9cf69ff18f3 (patch)
treefbcab567da9ef6d2c36404d77f8a38301fd040a7 /epan/dissectors/packet-6lowpan.c
parent54356d4ccb5c20cfa1874613f5541450172f7234 (diff)
From Colin O'Flynn:
Avoid processing tvb when fragment dissection didn't create one. svn path=/trunk/; revision=37426
Diffstat (limited to 'epan/dissectors/packet-6lowpan.c')
-rw-r--r--epan/dissectors/packet-6lowpan.c5
1 files changed, 5 insertions, 0 deletions
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);