From 7aef2f63085557d473a26bb52efb9896a2c885a9 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 25 Jul 2011 21:11:50 +0200 Subject: s3-spoolss: Use tmp_ctx in winreg_enum_printer_dataex_internal. --- source3/rpc_server/spoolss/srv_spoolss_util.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c index d924078c6c..ea46df2fc4 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_util.c +++ b/source3/rpc_server/spoolss/srv_spoolss_util.c @@ -291,15 +291,28 @@ WERROR winreg_enum_printer_dataex_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_enum_printer_dataex(mem_ctx, b, - printer, - key, - pnum_values, - penum_values); + result = winreg_enum_printer_dataex(mem_ctx, + b, + printer, + key, + pnum_values, + penum_values); + + talloc_free(tmp_ctx); + return result; } WERROR winreg_get_printer_dataex_internal(TALLOC_CTX *mem_ctx, -- cgit