The branch, master has been updated
       via  8e91c40... s3: Fix reference to freed memory in pam_winbind.
      from  e0e7ca4... Revert "s4:hdb-samba4 - Don't double-free "db""

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


- Log -----------------------------------------------------------------
commit 8e91c40574ce30a053ff8979e69205d15fb89a5c
Author: Bo Yang <boy...@samba.org>
Date:   Thu Oct 15 04:31:26 2009 +0800

    s3: Fix reference to freed memory in pam_winbind.
    
    Signed-off-by: Bo Yang <boy...@samba.org>

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

Summary of changes:
 nsswitch/pam_winbind.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 654b438..fd06688 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -981,6 +981,7 @@ static bool winbind_name_to_sid_string(struct pwb_context 
*ctx,
                                       int sid_list_buffer_size)
 {
        const char* sid_string;
+       char *sid_str;
 
        /* lookup name? */
        if (IS_SID_STRING(name)) {
@@ -989,7 +990,6 @@ static bool winbind_name_to_sid_string(struct pwb_context 
*ctx,
                wbcErr wbc_status;
                struct wbcDomainSid sid;
                enum wbcSidType type;
-               char *sid_str;
 
                _pam_log_debug(ctx, LOG_DEBUG,
                               "no sid given, looking up: %s\n", name);
@@ -1006,15 +1006,16 @@ static bool winbind_name_to_sid_string(struct 
pwb_context *ctx,
                        return false;
                }
 
-               wbcFreeMemory(sid_str);
                sid_string = sid_str;
        }
 
        if (!safe_append_string(sid_list_buffer, sid_string,
                                sid_list_buffer_size)) {
+               wbcFreeMemory(sid_str);
                return false;
        }
 
+       wbcFreeMemory(sid_str);
        return true;
 }
 


-- 
Samba Shared Repository

Reply via email to