From d5e3fa9ca34a51a3cf1478fe67ccd6efde1bf65b Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 14 Oct 2003 00:45:54 +0000 Subject: [PATCH] "dce_try_handoff()" isn't necessarily passed a non-null "auth_info" argument - don't dereference it if it's null. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8685 f5534014-38df-0310-8fa8-9805f1628bb7 --- packet-dcerpc.c | 10 ++++++---- 1 file 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 * Copyright 2003, Tim Potter * - * $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 @@ -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; -- 2.34.1