From: Günther Deschner <gd@samba.org>
Date: Tue, 10 Nov 2009 10:04:08 +0000 (+0100)
Subject: s3-rpc_client: protect rpc_pipe_np_smb_conn against a NULL struct rpc_pipe_client.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fe281e25708b999a3e9ef1d5808a79995fbb438;p=thirdparty%2Fsamba.git

s3-rpc_client: protect rpc_pipe_np_smb_conn against a NULL struct rpc_pipe_client.

Guenther

Part of a fix for bug #6697.
---

diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index be84c3934ff..6a5802e97f7 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -2348,6 +2348,9 @@ bool rpccli_get_pwd_hash(struct rpc_pipe_client *cli, uint8_t nt_hash[16])
 
 struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p)
 {
+	if (p == NULL) {
+		return NULL;
+	}
 	if (p->transport_type == NCACN_NP) {
 		return p->trans.np.cli;
 	}