From: Andreas Schneider <asn@samba.org>
Date: Mon, 25 Jul 2011 19:37:25 +0000 (+0200)
Subject: s3-spoolss: Use tmp_ctx in winreg_printer_getform1_internal.
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=a6ea1542c549d33f56877fdac0dfd87a76518778;p=metze%2Fsamba%2Fwip.git

s3-spoolss: Use tmp_ctx in winreg_printer_getform1_internal.
---

diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c
index 71868a53d859..a5023329033c 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -613,13 +613,26 @@ WERROR winreg_printer_getform1_internal(TALLOC_CTX *mem_ctx,
 {
 	WERROR result;
 	struct dcerpc_binding_handle *b;
+	TALLOC_CTX *tmp_ctx;
 
-	result = winreg_printer_binding_handle(mem_ctx, session_info, msg_ctx, &b);
-	W_ERROR_NOT_OK_RETURN(result);
+	tmp_ctx = talloc_stackframe();
+	if (tmp_ctx == NULL) {
+		return WERR_NOMEM;
+	}
 
-	return winreg_printer_getform1(mem_ctx, b,
-				       form_name,
-				       r);
+	result = winreg_printer_binding_handle(tmp_ctx, session_info, msg_ctx, &b);
+	if (!W_ERROR_IS_OK(result)) {
+		talloc_free(tmp_ctx);
+		return result;
+	}
+
+	result = winreg_printer_getform1(mem_ctx,
+					 b,
+					 form_name,
+					 r);
+
+	talloc_free(tmp_ctx);
+	return result;
 }
 
 WERROR winreg_printer_addform1_internal(TALLOC_CTX *mem_ctx,