diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-10-14 00:45:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-10-14 00:45:54 +0000 |
| commit | a5287eb7d215aad35c74fe61b9b93bf9fb2c5591 (patch) | |
| tree | bf891f9b5a4bf57e61a0e8e21c6f355d525c82ac /packet-dcerpc.c | |
| parent | e8e73d6cafa0caeb46895b7f0f0194a9c282ff89 (diff) | |
| download | wireshark-a5287eb7d215aad35c74fe61b9b93bf9fb2c5591.tar.gz wireshark-a5287eb7d215aad35c74fe61b9b93bf9fb2c5591.tar.bz2 wireshark-a5287eb7d215aad35c74fe61b9b93bf9fb2c5591.zip | |
"dce_try_handoff()" isn't necessarily passed a non-null "auth_info"
argument - don't dereference it if it's null.
svn path=/trunk/; revision=8685
Diffstat (limited to 'packet-dcerpc.c')
| -rw-r--r-- | packet-dcerpc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packet-dcerpc.c b/packet-dcerpc.c index 34d8dd6f48..971d3324e4 100644 --- a/packet-dcerpc.c +++ b/packet-dcerpc.c @@ -3,7 +3,7 @@ * Copyright 2001, Todd Sabin <tas@webspan.net> * Copyright 2003, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc.c,v 1.144 2003/10/10 11:11:37 sahlberg Exp $ + * $Id: packet-dcerpc.c,v 1.145 2003/10/14 00:45:54 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1821,10 +1821,12 @@ dcerpc_try_handoff (packet_info *pinfo, proto_tree *tree, sub_dissect = info->request ? proc->dissect_rqst : proc->dissect_resp; - /* Call subdissector if we have a zero auth_level and no decrypted data, - or non-zero auth_level and sucessfully decrypted data. */ + /* Call subdissector if we have no auth info, or a zero auth_level and + no decrypted data, or non-zero auth_level and sucessfully decrypted + data. */ - if (sub_dissect && ((!auth_info->auth_level && !pinfo->decrypted_data) || + if (sub_dissect && (auth_info == NULL || + (!auth_info->auth_level && !pinfo->decrypted_data) || (auth_info->auth_level && pinfo->decrypted_data))) { saved_proto = pinfo->current_proto; saved_private_data = pinfo->private_data; |