[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  ed68f75 s3: Do not free a string where we should not
       via  db68915 s3: Do not free a string where we should not
      from  994eec4 s3: Fix Coverity ID 741407 -- resource leak

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


- Log -----------------------------------------------------------------
commit ed68f75b676a6b1d08f9668d29ff6d09f558fbe6
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 25 14:19:32 2012 +0000

    s3: Do not free a string where we should not
    
    Reviewed by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Nov 26 22:03:05 CET 2012 on sn-devel-104

commit db68915a4eaaedede9dac77c6c748718ce156139
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 25 14:19:32 2012 +0000

    s3: Do not free a string where we should not
    
    Reviewed by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/winbindd/winbindd_cache.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 517a302..e3406a5 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -1114,7 +1114,7 @@ NTSTATUS resolve_username_to_alias( TALLOC_CTX *mem_ctx,
 	if ( (upper_name = SMB_STRDUP(name)) == NULL )
 		return NT_STATUS_NO_MEMORY;
 	if (!strupper_m(upper_name)) {
-		SAFE_FREE(name);
+		SAFE_FREE(upper_name);
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -1192,7 +1192,7 @@ NTSTATUS resolve_alias_to_username( TALLOC_CTX *mem_ctx,
 	if ( (upper_name = SMB_STRDUP(alias)) == NULL )
 		return NT_STATUS_NO_MEMORY;
 	if (!strupper_m(upper_name)) {
-		SAFE_FREE(alias);
+		SAFE_FREE(upper_name);
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 


-- 
Samba Shared Repository