diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-03-23 18:44:51 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-03-23 18:44:51 +0000 |
| commit | 399b54bebb62ab53fed54024545aef32f371a045 (patch) | |
| tree | d5351c38a33d7cd11cff83f2fbf4e1dd708e297d /packet-dcerpc-samr.c | |
| parent | e12b71004c80c1659387e42da6640966ead862ff (diff) | |
From Ronnie Sahlberg: small fix to prevent dereferencing null pointers.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10464 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-dcerpc-samr.c')
| -rw-r--r-- | packet-dcerpc-samr.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c index b8b25c137b..c67b74a24c 100644 --- a/packet-dcerpc-samr.c +++ b/packet-dcerpc-samr.c @@ -3,7 +3,7 @@ * Copyright 2001,2003 Tim Potter <tpot@samba.org> * 2002 Added all command dissectors Ronnie Sahlberg * - * $Id: packet-dcerpc-samr.c,v 1.103 2004/01/19 20:10:35 jmayer Exp $ + * $Id: packet-dcerpc-samr.c,v 1.104 2004/03/23 18:44:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -498,7 +498,12 @@ dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_nt_sid(tvb, offset, tree, name, &sid_str, hf_sid); - dcv->private_data = sid_str; + /* dcv can be null, for example when this ndr structure is embedded + * inside non-dcerpc pdus, i.e. kerberos PAC structure + */ + if(dcv){ + dcv->private_data = sid_str; + } return offset; } |