aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-04-28 04:54:25 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-04-28 04:54:25 +0000
commit556fd7122c88c4287e611bbdafe0820b3e77f296 (patch)
tree14760f38625f0c5162cb5daec1238ddef452f345
parent3ba415f7ee301ea60f6d28957f2c991f5a2ff85e (diff)
From Michael Lum:
EVRC packet bundling not handled correctly. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4718 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32582 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--epan/dissectors/packet-evrc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c
index babea7bca3..e6282521f8 100644
--- a/epan/dissectors/packet-evrc.c
+++ b/epan/dissectors/packet-evrc.c
@@ -318,7 +318,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia
i++;
- if ((frame_count & 0x01) == 0)
+ if (i < frame_count)
{
/* even number of frames */
proto_tree_add_item(toc_tree, hf_toc_frame_type_low, tvb, offset, 1, FALSE);
@@ -337,7 +337,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia
proto_tree_add_item(toc_tree, hf_evrc_padding, tvb, offset-1, 1, FALSE);
}
- proto_item_set_len(item, (offset - 1) - saved_offset);
+ proto_item_set_len(item, offset - saved_offset);
}
i = 0;