aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rsvp.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2005-08-28 20:15:08 +0000
committerGerald Combs <gerald@wireshark.org>2005-08-28 20:15:08 +0000
commite06c37bc455b2571f507026c793a1b403d577bf4 (patch)
tree7818b629867b34e58963461e095f34e450d1d4a2 /epan/dissectors/packet-rsvp.c
parent94e0d144c6b736ecdae44645b7cab42f7cf4098c (diff)
Correct an eariler infinite loop fix. Fixes bug 382.
svn path=/trunk/; revision=15600
Diffstat (limited to 'epan/dissectors/packet-rsvp.c')
-rw-r--r--epan/dissectors/packet-rsvp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index c7925c765f..797ba92cf5 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -4056,12 +4056,12 @@ dissect_rsvp_gen_uni (proto_tree *ti, proto_tree *rsvp_object_tree,
}
- l += tvb_get_guint8(tvb, offset2+l+1);
- if (l < 1) {
+ if (tvb_get_guint8(tvb, offset2+l+1) < 1) {
proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+1, 1,
"Invalid length: %u", tvb_get_guint8(tvb, offset2+l+1));
return;
}
+ l += tvb_get_guint8(tvb, offset2+l+1);
if (l < mylen) {
if (i < 4)
proto_item_append_text(ti, ", ");