diff options
| author | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-04-28 10:42:14 +0000 |
|---|---|---|
| committer | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-04-28 10:42:14 +0000 |
| commit | 384c2aac53b2a0d625ac43aff2c199b5b4a768cb (patch) | |
| tree | a20334e82e16c7b7a430773639ce8550928101d0 /packet-smb.c | |
| parent | 88d3eb3fd52c9973b0a9f0a76f0488014318ce00 (diff) | |
dissect_nt_access_mask() sometimes ami is NULL.
check that it is non-NULL before we dereference it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7592 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-smb.c')
| -rw-r--r-- | packet-smb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-smb.c b/packet-smb.c index bc0bb391e1..5e43710e38 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.335 2003/04/28 04:44:54 tpot Exp $ + * $Id: packet-smb.c,v 1.336 2003/04/28 10:42:14 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -7337,7 +7337,7 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, pointer if we have one, otherwise just display bits 0-15 in boring fashion. */ - if (ami->specific_rights_name) + if (ami && ami->specific_rights_name) item = proto_tree_add_text(subtree, tvb, offset - 4, 4, "%s specific rights: 0x%08x", ami->specific_rights_name, @@ -7349,7 +7349,7 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, specific = proto_item_add_subtree(item, ett_nt_access_mask_specific); - if (ami->specific_rights_fn) { + if (ami && ami->specific_rights_fn) { ami->specific_rights_fn(tvb, offset - 4, specific, access); return offset; } |