aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-aim-sst.c
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2006-08-04 10:16:10 +0000
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2006-08-04 10:16:10 +0000
commit616a6a1509387455c1e390944db271263ca6d986 (patch)
treebe2f78e04f30cf44c9090576bac943c13bf74dc8 /epan/dissectors/packet-aim-sst.c
parent7d29d978cec90808c2789f40259feed805df62c9 (diff)
Checked also needed here - remove wrong comment
svn path=/trunk/; revision=18835
Diffstat (limited to 'epan/dissectors/packet-aim-sst.c')
-rw-r--r--epan/dissectors/packet-aim-sst.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c
index 554f0bef62..a65bbb8496 100644
--- a/epan/dissectors/packet-aim-sst.c
+++ b/epan/dissectors/packet-aim-sst.c
@@ -95,8 +95,6 @@ static int dissect_aim_sst_buddy_down_repl (tvbuff_t *tvb, packet_info *pinfo _U
if (icon_size && (tvb_ensure_length_remaining(tvb, offset) >= icon_size))
{
- /* TODO: this is set to FT_UINT16 - is length fixed, or would
- FT_BYTES be better? */
proto_tree_add_item(tree, hf_aim_sst_icon, tvb, offset, icon_size, FALSE);
}
@@ -135,7 +133,10 @@ static int dissect_aim_sst_buddy_up_req (tvbuff_t *tvb, packet_info *pinfo _U_,
icon_size = tvb_get_ntohs(tvb, offset);
offset+=2;
- proto_tree_add_item(tree, hf_aim_sst_icon, tvb, offset, icon_size, FALSE);
+ if (icon_size && (tvb_ensure_length_remaining(tvb, offset) >= icon_size))
+ {
+ proto_tree_add_item(tree, hf_aim_sst_icon, tvb, offset, icon_size, FALSE);
+ }
offset+=icon_size;
return offset;