Fix for bug 4444.

svn path=/trunk/; revision=31780
This commit is contained in:
Gerald Combs 2010-02-03 23:10:45 +00:00
parent a358ec76a8
commit fe6dc2f7c3
1 changed files with 2 additions and 2 deletions

View File

@ -3360,7 +3360,7 @@ dissect_v9_options_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutr
entry_length = tvb_get_ntohs(tvb, offset);
if (tplt.entries && (flowset_id == 3 ? i < tplt.count : 1)) {
if (tplt.entries && i < option_len) {
tplt.entries[i].type = type;
tplt.entries[i].length = entry_length == VARIABLE_LENGTH ? 0 : entry_length;
tplt.length += tplt.entries[i].length;
@ -3371,7 +3371,7 @@ dissect_v9_options_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutr
/* Private Enterprise Number (IPFIX only) */
if ((flowset_id == 3) && (type & 0x8000)) {
if (tplt.entries && i < tplt.count) {
if (tplt.entries && i < option_len) {
tplt.entries[i].pen = tvb_get_ntohl(tvb,offset);
}
proto_tree_add_item(pdutree,