From 022a13f1e0775a6abba4d6a834e09257f6491c26 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 25 Jul 2011 21:32:22 +0200 Subject: s3-spoolss: Use tmp_ctx in winreg_add_driver_internal. --- source3/rpc_server/spoolss/srv_spoolss_util.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'source3/rpc_server/spoolss/srv_spoolss_util.c') diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c index ecfbde6b22..820a75b503 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_util.c +++ b/source3/rpc_server/spoolss/srv_spoolss_util.c @@ -492,14 +492,27 @@ WERROR winreg_add_driver_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; + } + + result = winreg_printer_binding_handle(tmp_ctx, session_info, msg_ctx, &b); + if (!W_ERROR_IS_OK(result)) { + talloc_free(tmp_ctx); + return result; + } - return winreg_add_driver(mem_ctx, b, - r, - driver_name, - driver_version); + result = winreg_add_driver(mem_ctx, + b, + r, + driver_name, + driver_version); + + talloc_free(tmp_ctx); + return result; } WERROR winreg_get_printer_secdesc_internal(TALLOC_CTX *mem_ctx, -- cgit