osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8360 

Bail out if length is less than the minimum required length.

svn path=/trunk/; revision=47776
This commit is contained in:
Evan Huus 2013-02-20 20:49:36 +00:00
parent 4b8a9dfefa
commit d7865654fc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-hartip.c
View File

@ -857,7 +857,7 @@ dissect_hartip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
length = tvb_get_ntohs(tvb, offset+6);
hart_item = proto_tree_add_item(tree, proto_hartip, tvb, 0, length, ENC_NA );
hart_item = proto_tree_add_item(tree, proto_hartip, tvb, 0, length, ENC_NA);
hartip_tree = proto_item_add_subtree(hart_item, ett_hartip);
ti = proto_tree_add_text(hartip_tree, tvb, offset, HARTIP_HEADER_LENGTH, "HART_IP Header");
@ -904,6 +904,8 @@ dissect_hartip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree_add_item(hdr_tree, hf_hartip_hdr_msg_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
if (length < HARTIP_HEADER_LENGTH)
return tvb_reported_length(tvb);
bodylen = length - HARTIP_HEADER_LENGTH;
/* add body elements. */