aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-m2tp.c
diff options
context:
space:
mode:
authorChris Maynard <Christopher.Maynard@GTECH.COM>2013-04-02 21:13:02 +0000
committerChris Maynard <Christopher.Maynard@GTECH.COM>2013-04-02 21:13:02 +0000
commitee5c5e93612f6b9b875cfe8736bf738242c3c11f (patch)
tree9101994fc9188ddf1c9a2325a6b3f5a603cf25dc /epan/dissectors/packet-m2tp.c
parent432e914dbd43c3ee354aa1eeff8f2dc750913f0e (diff)
Both tvb_length_remaining and tvb_reported_length_remaining can return -1.
#BACKPORT(1.6,1.8 ... manually as other occurrences are in those trunks) svn path=/trunk/; revision=48710
Diffstat (limited to 'epan/dissectors/packet-m2tp.c')
-rw-r--r--epan/dissectors/packet-m2tp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c
index 767912300d..14339b0a3f 100644
--- a/epan/dissectors/packet-m2tp.c
+++ b/epan/dissectors/packet-m2tp.c
@@ -511,7 +511,7 @@ dissect_m2tp_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2tp
offset += COMMON_HEADER_LENGTH;
/* extract zero or more parameters and process them individually */
- while(tvb_reported_length_remaining(message_tvb, offset)) {
+ while(tvb_reported_length_remaining(message_tvb, offset) > 0) {
length = tvb_get_ntohs(message_tvb, offset + PARAMETER_LENGTH_OFFSET);
padding_length = nr_of_padding_bytes(length);
total_length = length + padding_length;