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

- get_x25_pkt_len() : 

In "call accept" packets, the address block is not mandatory.
Check the packet length before trying to read the addresses.

svn path=/trunk/; revision=3739
This commit is contained in:
Olivier Abad 2001-07-18 15:49:29 +00:00
parent 624a4884fc
commit fc603eaf9a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packet-x25.c
View File

@ -2,7 +2,7 @@
* Routines for x25 packet disassembly
* Olivier Abad <oabad@cybercable.fr>
*
* $Id: packet-x25.c,v 1.52 2001/07/16 20:57:42 guy Exp $
* $Id: packet-x25.c,v 1.53 2001/07/18 15:49:29 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -1386,6 +1386,11 @@ get_x25_pkt_len(tvbuff_t *tvb)
return MIN(tvb_reported_length(tvb),length);
case X25_CALL_ACCEPTED:
/* The calling/called address length byte (following the packet type)
* is not mandatory, so we must check the packet length before trying
* to read it */
if (tvb_reported_length(tvb) == 3)
return(3);
bytex = tvb_get_guint8(tvb, 3);
called_len = (bytex >> 0) & 0x0F;
calling_len = (bytex >> 4) & 0x0F;