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

TCPCL: Return -1 when tcp_dissect_pdus asks for a length and it doesn't look like a TCPCL packet. 

This will stop dissection of Bundle packets, but more importantly
prevents assertion in TCP dissector when trying to reassemble
the packets as TCPCL/Bundle.

Bug: 11395
Bug: 12462
Change-Id: I3a2ccd5e02022dfe03bc93d81bfbd3f2d3bcd8aa
Reviewed-on: https://code.wireshark.org/review/15537
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Michael Mann 2016-05-22 14:22:18 -04:00 committed by Anders Broman
parent 9b0b20b8d5
commit 61ca43521b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-dtn.c
View File

@ -1796,7 +1796,8 @@ get_tcpcl_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data
return len;
}
return 0;
/* This probably isn't a TCPCL/Bundle packet, so just stop dissection */
return -1;
}
static int