summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-25 21:15:36 +0200
committerAndreas Schneider <asn@samba.org>2011-07-27 08:50:00 +0200
commit72ac68e7467f9a28389f9487b93096bb2e7c1622 (patch)
tree8e252ea82931e424b9d4b1d0a9cad5c031aecc4b
parent2e2631f55442f1bff4a9a7c22dbdbde77053d2c8 (diff)
downloadsamba-72ac68e7467f9a28389f9487b93096bb2e7c1622.tar.gz
samba-72ac68e7467f9a28389f9487b93096bb2e7c1622.tar.bz2
samba-72ac68e7467f9a28389f9487b93096bb2e7c1622.zip
s3-spoolss: Use tmp_ctx in winreg_get_driver_list_internal.
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_util.c27
1 files 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 394c8d27a7..a6a922e214 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -429,15 +429,28 @@ WERROR winreg_get_driver_list_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;
+ }
+
+ result = winreg_get_driver_list(mem_ctx,
+ b,
+ architecture,
+ version,
+ num_drivers,
+ drivers_p);
- return winreg_get_driver_list(mem_ctx, b,
- architecture,
- version,
- num_drivers,
- drivers_p);
+ talloc_free(tmp_ctx);
+ return result;
}
WERROR winreg_del_driver_internal(TALLOC_CTX *mem_ctx,