summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-25 21:38:12 +0200
committerAndreas Schneider <asn@samba.org>2011-07-27 08:50:00 +0200
commitbaccb06658fde3d49b58c6aeb17f0e9c320dbd01 (patch)
tree050a44e95a8bd6ce91085e9c6e82cbb57d3e7432
parenta6ea1542c549d33f56877fdac0dfd87a76518778 (diff)
downloadsamba-baccb06658fde3d49b58c6aeb17f0e9c320dbd01.tar.gz
samba-baccb06658fde3d49b58c6aeb17f0e9c320dbd01.tar.bz2
samba-baccb06658fde3d49b58c6aeb17f0e9c320dbd01.zip
s3-spoolss: Use tmp_ctx in winreg_printer_addform1_internal.
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_util.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c
index a502332903..df419ec0e5 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -642,12 +642,25 @@ WERROR winreg_printer_addform1_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_addform1(mem_ctx, b,
- form);
+ 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_addform1(mem_ctx,
+ b,
+ form);
+
+ talloc_free(tmp_ctx);
+ return result;
}
WERROR winreg_printer_setform1_internal(TALLOC_CTX *mem_ctx,