osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 2 bugs: 

- Misplaced } resulted in incorrect program flow in switch statement;
- Invalid input caused "Dissector bug: infinite loop";

svn path=/trunk/; revision=25913
This commit is contained in:
Bill Meier 2008-08-04 02:56:47 +00:00
parent be04142585
commit 8f84b18945
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
epan/dissectors/packet-ncp2222.inc
View File

@ -6588,24 +6588,32 @@ process_multivalues(proto_tree *ncp_tree, tvbuff_t *tvb, packet_info *pinfo, nds
values->vstring = get_string(tvb, ioffset, value2);
proto_tree_add_string(sub2tree, hf_mv_string, tvb, ioffset,
value2, values->vstring);
ioffset += value2;
}
}
values->voffset=ioffset;
break;
default: /* All other name types are just a string */
values->vstring = get_string(tvb, ioffset, values->vlength);
proto_tree_add_string(ntree, hf_mv_string, tvb, ioffset,
values->vlength, values->vstring);
values->voffset=ioffset + values->vlength;
ioffset = values->voffset;
ioffset += align_4(tvb, ioffset);
break;
}
ioffset += value2;
}
/* XXX: What if "multiple items" ? */
/* What if "Undefined ... " ? */
/* For now: we'll just keep on walking... */
/* Presumably we'll get a ReportedBoundsError */
/* pretty quickly. */
else /* Undefined or "multiple items" ... */
{
ioffset += 4;
}
} /* for */
} /* else */
values->voffset=ioffset;
break;
default: /* All other name types are just a string */
values->vstring = get_string(tvb, ioffset, values->vlength);
proto_tree_add_string(ntree, hf_mv_string, tvb, ioffset,
values->vlength, values->vstring);
values->voffset=ioffset + values->vlength;
ioffset = values->voffset;
ioffset += align_4(tvb, ioffset);
break;
}
break;
} /* switch (values->vflags) */
break;
case MVTYPE_PROCESS_ITERATOR: /* Process Iterator subverbs. */
temp_values.vvalue = tvb_get_letohl(tvb, ioffset);