summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-25 21:37:25 +0200
committerAndreas Schneider <asn@samba.org>2011-07-27 08:50:00 +0200
commita6ea1542c549d33f56877fdac0dfd87a76518778 (patch)
treeba437ba4815351eaf78e4deea4adeebe896fe33f
parentf49917ade0c4dda99d7188e8556b35a76f3f39b0 (diff)
downloadsamba-a6ea1542c549d33f56877fdac0dfd87a76518778.tar.gz
samba-a6ea1542c549d33f56877fdac0dfd87a76518778.tar.bz2
samba-a6ea1542c549d33f56877fdac0dfd87a76518778.zip
s3-spoolss: Use tmp_ctx in winreg_printer_getform1_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 71868a53d8..a502332903 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,