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

Check our PDU length. Fixes the infinite loop found in bug 5876. 

svn path=/trunk/; revision=36958
This commit is contained in:
Gerald Combs 2011-04-30 17:43:05 +00:00
parent 48abbd7f6c
commit b97275395f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-dcm.c
View File

@ -6519,6 +6519,7 @@ dissect_dcm_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i
/* Process all PDUs in the buffer */
while (pdu_start < tlen) {
guint32 old_pdu_start;
if ((pdu_len+6) > (tlen-offset)) {
@ -6539,7 +6540,13 @@ dissect_dcm_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i
offset=dissect_dcm_pdu(tvb, pinfo, tree, pdu_start);
/* Next PDU */
old_pdu_start = pdu_start;
pdu_start = pdu_start + pdu_len + 6;
if (pdu_start <= old_pdu_start) {
expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR,
"Invalid PDU length (%u)", pdu_len);
THROW(ReportedBoundsError);
}
if (pdu_start < tlen - 6) {
/* we got at least 6 bytes of the next PDU still in the buffer */