[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3518-g525af71

Jeremy Allison jra at samba.org
Tue Mar 24 22:30:28 GMT 2009


The branch, v3-2-test has been updated
       via  525af716cd52500a4e3dccf9eeb9ea85f86be7ca (commit)
      from  e217138a36b1ba1eff164aecfa52ba6fe8864747 (commit)

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


- Log -----------------------------------------------------------------
commit 525af716cd52500a4e3dccf9eeb9ea85f86be7ca
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 24 15:29:35 2009 -0700

    Fix two memleaks in the encryption code
    
    ntlmssp_seal_packet creates its own signature data blob, which we then
    have to free.
    
    Jeremy, please check and merge appropriately (Yes, I'm asking you to do the
    janitor work, I want you to *look* at this :-))
    
    Volker

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

Summary of changes:
 source/libsmb/smb_seal.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/smb_seal.c b/source/libsmb/smb_seal.c
index 795c8bc..2f7305c 100644
--- a/source/libsmb/smb_seal.c
+++ b/source/libsmb/smb_seal.c
@@ -136,7 +136,7 @@ NTSTATUS common_ntlm_encrypt_buffer(NTLMSSP_STATE *ntlmssp_state,
 
 	smb_set_enclen(buf_out, smb_len(buf) + NTLMSSP_SIG_SIZE, enc_ctx_num);
 
-	sig = data_blob(NULL, NTLMSSP_SIG_SIZE);
+	ZERO_STRUCT(sig);
 
 	status = ntlmssp_seal_packet(ntlmssp_state,
 		(unsigned char *)buf_out + 8 + NTLMSSP_SIG_SIZE, /* 4 byte len + 0xFF 'S' <enc> <ctx> */
@@ -153,6 +153,7 @@ NTSTATUS common_ntlm_encrypt_buffer(NTLMSSP_STATE *ntlmssp_state,
 
 	/* First 16 data bytes are signature for SSPI compatibility. */
 	memcpy(buf_out + 8, sig.data, NTLMSSP_SIG_SIZE);
+	data_blob_free(&sig);
 	*ppbuf_out = buf_out;
 	return NT_STATUS_OK;
 }


-- 
Samba Shared Repository


More information about the samba-cvs mailing list