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

fix two bugs when updating offset incorrectly that could lead to an infinite loop when trying to decode an unknown ber structure 

svn path=/trunk/; revision=14799
This commit is contained in:
Ronnie Sahlberg 2005-06-27 11:43:18 +00:00
parent 6838ce2807
commit 05f9375d55
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,7 @@ int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
next_tree=proto_item_add_subtree(item, ett_ber_SEQUENCE);
}
next_tvb=tvb_new_subset(tvb, offset, len, len);
offset=dissect_unknown_ber(pinfo, next_tvb, 0, next_tree);
offset += dissect_unknown_ber(pinfo, next_tvb, 0, next_tree);
break;
case BER_UNI_TAG_NumericString:
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_NumericString, NULL);
@ -331,7 +331,7 @@ int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
next_tree=proto_item_add_subtree(item, ett_ber_SEQUENCE);
}
next_tvb=tvb_new_subset(tvb, offset, len, len);
offset=dissect_unknown_ber(pinfo, next_tvb, 0, next_tree);
offset += dissect_unknown_ber(pinfo, next_tvb, 0, next_tree);
break;
default:
proto_tree_add_text(tree, tvb, offset, len, "BER: Error can not handle class:%d (0x%02x)",class,tvb_get_guint8(tvb, start_offset));