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

Fix the disssector assertion reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3877 :

Browse source 
The rest of the code assumes that sip can be NULL, so don't assert when it's
not.

Also make fid_cmp() static since it's only used in this module.

svn path=/trunk/; revision=34663
This commit is contained in:
Jeff Morriss 2010-10-27 21:08:49 +00:00
parent 4a120508d6
commit 505fbf012a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
epan/dissectors/packet-smb.c
View file

@ -887,12 +887,13 @@ static int dissect_smb_command(tvbuff_t *tvb, packet_info *pinfo, int offset, pr
offset += len; \
*bcp -= len;
gboolean sid_display_hex = FALSE;
gboolean sid_display_hex = FALSE;
gboolean sid_name_snooping = FALSE;
/* Compare funtion to maintain the GSL_fid_info ordered
Order criteria: packet where the fid was opened */
gint fid_cmp(smb_fid_info_t *fida, smb_fid_info_t *fidb)
static gint
fid_cmp(smb_fid_info_t *fida, smb_fid_info_t *fidb)
{
return (fida->opened_in - fidb->opened_in);
}
@ -8732,9 +8733,8 @@ dissect_nt_trans_setup_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pr
si = (smb_info_t *)pinfo->private_data;
DISSECTOR_ASSERT(si);
sip = si->sip;
DISSECTOR_ASSERT(sip);
if (sip->extra_info_type == SMB_EI_NTI) {
nti=sip->extra_info;
if (sip && sip->extra_info_type == SMB_EI_NTI) {
nti=sip->extra_info;
}
if(parent_tree){