From: Günther Deschner <gd@samba.org>
Date: Thu, 18 Feb 2010 01:03:53 +0000 (+0100)
Subject: s3-spoolss: in spoolss_EnumPrinters r->in.server is a *unique* pointer!
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd76c22f4c7ab39b79f5cf381d39bff1b974363f;p=thirdparty%2Fsamba.git

s3-spoolss: in spoolss_EnumPrinters r->in.server is a *unique* pointer!

Guenther
(cherry picked from commit 8ce66fba03f782c0b9948a9835bb488cfa74acf9)
(cherry picked from commit cb6fcb9b16b36fcdc68bef382dbd7ecf89521d4e)
---

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index b1343861567..2dac5f6c4ab 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4460,7 +4460,7 @@ static WERROR enumprinters_level5(TALLOC_CTX *mem_ctx,
 WERROR _spoolss_EnumPrinters(pipes_struct *p,
 			     struct spoolss_EnumPrinters *r)
 {
-	const char *name;
+	const char *name = NULL;
 	WERROR result;
 
 	/* that's an [in out] buffer */
@@ -4488,8 +4488,10 @@ WERROR _spoolss_EnumPrinters(pipes_struct *p,
 	 * Level 5: same as Level 2
 	 */
 
-	name = talloc_strdup_upper(p->mem_ctx, r->in.server);
-	W_ERROR_HAVE_NO_MEMORY(name);
+	if (name) {
+		name = talloc_strdup_upper(p->mem_ctx, r->in.server);
+		W_ERROR_HAVE_NO_MEMORY(name);
+	}
 
 	switch (r->in.level) {
 	case 0: