s3-spoolss: Use tmp_ctx in winreg_del_driver_internal.
authorAndreas Schneider <asn@samba.org>
Mon, 25 Jul 2011 19:31:32 +0000 (21:31 +0200)
committerAndreas Schneider <asn@samba.org>
Wed, 27 Jul 2011 06:50:00 +0000 (08:50 +0200)
source3/rpc_server/spoolss/srv_spoolss_util.c

index a6a922e2146df4f841284c05c81517253bc644ab..ecfbde6b220215d5839ce22d1b0e8e5a2d28fff2 100644 (file)
@@ -461,13 +461,26 @@ WERROR winreg_del_driver_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_del_driver(mem_ctx, b,
-                                info8,
-                                version);
+       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_del_driver(mem_ctx,
+                                  b,
+                                  info8,
+                                  version);
+
+       talloc_free(tmp_ctx);
+       return result;
 }
 
 WERROR winreg_add_driver_internal(TALLOC_CTX *mem_ctx,