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

Don't loop forever in "find_rsvp_session_tempfilt()" or 

"dissect_rsvp_msg_tree()" if there's a zero-length object.

In "find_rsvp_session_tempfilt()", check to make sure the data exists
before fetching it, so that it doesn't throw an exception - the
information it returns is only used to put items into the protocol tree,
so there's no reason to quit dissecting the packet just because it can't
find that information because, for example, not enough of the packet
data was captured.

svn path=/trunk/; revision=5919
This commit is contained in:
Guy Harris 2002-07-31 10:10:44 +00:00
parent 8751a85ac2
commit 39927e5db7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packet-rsvp.c
View File

@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
* $Id: packet-rsvp.c,v 1.70 2002/07/15 21:19:56 ashokn Exp $
* $Id: packet-rsvp.c,v 1.71 2002/07/31 10:10:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -921,13 +921,18 @@ find_rsvp_session_tempfilt(tvbuff_t *tvb, int hdr_offset, int *session_offp, int
{
int s_off = 0, t_off = 0;
int len, off;
guint16 obj_length;
if (!tvb)
if (!tvb_bytes_exist(tvb, hdr_offset+6, 2))
goto done;
len = tvb_get_ntohs(tvb, hdr_offset+6) + hdr_offset;
off = hdr_offset + 8;
for (off = hdr_offset + 8; off < len; off += tvb_get_ntohs(tvb, off)) {
for (off = hdr_offset + 8; off < len && tvb_bytes_exist(tvb, off, 3);
off += obj_length) {
obj_length = tvb_get_ntohs(tvb, off);
if (obj_length == 0)
break;
switch(tvb_get_guint8(tvb, off+2)) {
case RSVP_CLASS_SESSION:
s_off = off;
@ -3835,6 +3840,8 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break;
}
if (obj_length == 0)
break;
offset += obj_length;
len += obj_length;
}