summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-25 21:36:34 +0200
committerAndreas Schneider <asn@samba.org>2011-07-27 08:50:00 +0200
commitf49917ade0c4dda99d7188e8556b35a76f3f39b0 (patch)
tree1f77e805ac5ffcbbb83701f6e765ff2a14bfe234
parent81eae6ebd4746e4c14fe86e7a77ce78a172d9234 (diff)
downloadsamba-f49917ade0c4dda99d7188e8556b35a76f3f39b0.tar.gz
samba-f49917ade0c4dda99d7188e8556b35a76f3f39b0.tar.bz2
samba-f49917ade0c4dda99d7188e8556b35a76f3f39b0.zip
s3-spoolss: Use tmp_ctx in winreg_printer_enumforms1_internal.
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_util.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c
index 445e2cfcaa..71868a53d8 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -583,13 +583,26 @@ WERROR winreg_printer_enumforms1_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_enumforms1(mem_ctx, b,
- pnum_info,
- pinfo);
+ 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_enumforms1(mem_ctx,
+ b,
+ pnum_info,
+ pinfo);
+
+ talloc_free(tmp_ctx);
+ return result;
}
WERROR winreg_printer_getform1_internal(TALLOC_CTX *mem_ctx,