From: Jeremy Allison <jra@samba.org>
Date: Wed, 14 Sep 2011 18:55:16 +0000 (-0700)
Subject: Fix bug #8453 - smbclient segfaults when dialect option -m is used for legacy dialects
X-Git-Tag: samba-3.6.1~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7955a7deda68036de2714921fbe169ae1eaae59;p=thirdparty%2Fsamba.git

Fix bug #8453 - smbclient segfaults when dialect option -m is used for legacy dialects

Ensure we have valid pointers.
(cherry picked from commit 9bbb3a89ffa39c9be30c269bf96f080866740406)
---

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 81c1819964f..113b8a5f144 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1997,6 +1997,19 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
 	}
 
 	if (cli->protocol < PROTOCOL_LANMAN1) {
+		/*
+		 * Ensure cli->server_domain,
+		 * cli->server_os and cli->server_type
+		 * are valid pointers.
+		 */
+		cli->server_domain = talloc_strdup(cli, "");
+		cli->server_os = talloc_strdup(cli, "");
+		cli->server_type = talloc_strdup(cli, "");
+		if (cli->server_domain == NULL ||
+				cli->server_os == NULL ||
+				cli->server_type == NULL) {
+			return NT_STATUS_NO_MEMORY;
+		}
 		return NT_STATUS_OK;
 	}