[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-715-g25fc58a

[Günther Deschner]

The branch, master has been updated
       via  25fc58afcd6051cd387a7114afadab2a85b98cfb (commit)
      from  11f60a62a1d7633e9a8ec62da18ed9ababa694df (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 25fc58afcd6051cd387a7114afadab2a85b98cfb
Author: Günther Deschner <g...@samba.org>
Date:   Tue Feb 10 10:45:55 2009 +0100

    s3-spoolss: fix memleak in get_remote_printer_publishing_data().
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/libads/ldap_printer.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index c9c43f0..1bcb86e 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -327,11 +327,14 @@ WERROR get_remote_printer_publishing_data(struct 
rpc_pipe_client *cli,
        if (!W_ERROR_IS_OK(result)) {
                DEBUG(3, ("Unable to open printer %s, error is %s.\n",
                          printername, win_errstr(result)));
+               SAFE_FREE(printername);
                return result;
        }
        
-       if ( !(dsdriver_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) 
+       if ( !(dsdriver_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) )  {
+               SAFE_FREE(printername);
                return WERR_NOMEM;
+       }
 
        result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, 
SPOOL_DSDRIVER_KEY, dsdriver_ctr);
 
@@ -347,8 +350,10 @@ WERROR get_remote_printer_publishing_data(struct 
rpc_pipe_client *cli,
                }
        }
        
-       if ( !(dsspooler_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) )
+       if ( !(dsspooler_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) {
+               SAFE_FREE(printername);
                return WERR_NOMEM;
+       }
 
        result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, 
SPOOL_DSSPOOLER_KEY, dsspooler_ctr);
 
@@ -369,6 +374,7 @@ WERROR get_remote_printer_publishing_data(struct 
rpc_pipe_client *cli,
        TALLOC_FREE( dsspooler_ctr );
 
        rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL);
+       SAFE_FREE(printername);
 
        return result;
 }


-- 
Samba Shared Repository