diff options
| author | Gerald Combs <gerald@wireshark.org> | 2005-08-06 03:43:42 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2005-08-06 03:43:42 +0000 |
| commit | b992c7339116ada28b7021349a6dbea9f023ded0 (patch) | |
| tree | d34048dd20602ebb2a1ccafb954bec0bfe7c2e4a /epan/dissectors/packet-smb.c | |
| parent | 312c524a4cb9cfc7884ed2b06aa8806a686d10a7 (diff) | |
| download | wireshark-b992c7339116ada28b7021349a6dbea9f023ded0.tar.gz | |
In packet-frame.c, don't free static memory when we throw a
DissectorError. In packet-kerberos.c, restore pinfo->private_data if
we throw an exception, which keeps the SMB dissector from throwing
a DissectorError. Initialize variables in other places to squelch
valgrind warnings.
svn path=/trunk/; revision=15235
Diffstat (limited to 'epan/dissectors/packet-smb.c')
| -rw-r--r-- | epan/dissectors/packet-smb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index e8ac736a1d..fd396b9475 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -14762,7 +14762,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) nstime_t ns; si_counter++; - if(si_counter==20){ + if(si_counter>=20){ si_counter=0; } si=&si_arr[si_counter]; @@ -14838,6 +14838,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) si->ct->tid_service=g_hash_table_new( smb_saved_info_hash_unmatched, smb_saved_info_equal_unmatched); + si->ct->raw_ntlmssp = 0; conversation_add_proto_data(conversation, proto_smb, si->ct); } |