aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2018-02-17 23:22:31 +0100
committerMichael Mann <mmann78@netscape.net>2018-02-18 02:23:22 +0000
commit38d784d54734a4f8e561f6df3460d02aac53015e (patch)
treedd0593e3826a75466fb6adb3252fd1fd1970f667 /epan
parent5d99febe66e96b55a1defa58a906be254bad3a51 (diff)
6LoWPAN: break loop in case of unexpected loRHE type
Bug: 14422 Change-Id: I5875dd63282ff645e78a4b0cf5f34ea746ec7dfd Reviewed-on: https://code.wireshark.org/review/25852 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-6lowpan.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c
index c01a9fd628..4e9a08f2ad 100644
--- a/epan/dissectors/packet-6lowpan.c
+++ b/epan/dissectors/packet-6lowpan.c
@@ -1296,6 +1296,9 @@ dissect_6lowpan_6loRH(tvbuff_t *tvb, guint offset, proto_tree *tree)
}
offset += 2 + loRHE_length;
}
+ else {
+ condition -= 1;
+ }
break; /* case LOWPAN_PATTERN_6LORHE */
case (LOWPAN_PATTERN_6LORHC): /*Critical Routing Header*/
@@ -1385,6 +1388,9 @@ dissect_6lowpan_6loRH(tvbuff_t *tvb, guint offset, proto_tree *tree)
break; /**/
} /* switch loRHE_type */
} /* else if (loRHE_type <= 4) */
+ else {
+ condition -= 1;
+ }
break; /* case LOWPAN_PATTERN_6LORHC */
default: