[SCM] Samba Shared Repository - branch v3-5-test updated

[Bo Yang]

The branch, v3-5-test has been updated
       via  b46f0a7... s3: Fix crash in pam_winbind, another reference to freed memory.
      from  2b02c97... Simplify the logic. Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit b46f0a7bda7101517435ef612c68e81976d15102
Author: Bo Yang <boyang at samba.org>
Date:   Sat Oct 24 09:20:00 2009 +0800

    s3: Fix crash in pam_winbind, another reference to freed memory.
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    (cherry picked from commit b9a3f1dd85d168c15df846dba525f4f882d1acf8)

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

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


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 0eb24a2..7694251 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1788,7 +1788,7 @@ static int winbind_auth_request(struct pwb_context *ctx,
 	if (logon.blobs) {
 		wbcFreeMemory(logon.blobs);
 	}
-	if (info && info->blobs) {
+	if (info && info->blobs && !p_info) {
 		wbcFreeMemory(info->blobs);
 	}
 	if (error && !p_error) {
@@ -3141,10 +3141,14 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
 					free(username_ret);
 				}
 
-				wbcFreeMemory(info);
-				wbcFreeMemory(policy);
 			}
 
+			if (info && info->blobs) {
+				wbcFreeMemory(info->blobs);
+			}
+			wbcFreeMemory(info);
+			wbcFreeMemory(policy);
+
 			goto out;
 		}
 	} else {


-- 
Samba Shared Repository