sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-06 17:44:20 +03:00
Code Activity

r148: Ensure we do not dereference a null pointer when we return the user

Browse Source 
session key.
(This used to be commit b09d333aed)
This commit is contained in:
Andrew Bartlett
2004-04-10 19:24:31 +00:00
committed by Gerald (Jerry) Carter
parent 69a91df4ed
commit b81b4711f7
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source3/libsmb/ntlm_check.c
View File

@@ -330,7 +330,9 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
uint8 first_8_lm_hash[16]; uint8 first_8_lm_hash[16];
memcpy(first_8_lm_hash, lm_pw, 8); memcpy(first_8_lm_hash, lm_pw, 8);
memset(first_8_lm_hash + 8, '\0', 8); memset(first_8_lm_hash + 8, '\0', 8);
*lm_sess_key = data_blob(first_8_lm_hash, 16); if (lm_sess_key) {
*lm_sess_key = data_blob(first_8_lm_hash, 16);
}
} }
return NT_STATUS_OK; return NT_STATUS_OK;
} else { } else {
@@ -371,8 +373,13 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
uint8 first_8_lm_hash[16]; uint8 first_8_lm_hash[16];
memcpy(first_8_lm_hash, lm_pw, 8); memcpy(first_8_lm_hash, lm_pw, 8);
memset(first_8_lm_hash + 8, '\0', 8); memset(first_8_lm_hash + 8, '\0', 8);
*user_sess_key = data_blob(first_8_lm_hash, 16); if (user_sess_key) {
*lm_sess_key = data_blob(first_8_lm_hash, 16); *user_sess_key = data_blob(first_8_lm_hash, 16);
}
if (lm_sess_key) {
*lm_sess_key = data_blob(first_8_lm_hash, 16);
}
return NT_STATUS_OK; return NT_STATUS_OK;
} }
} }
@@ -431,8 +438,13 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
uint8 first_8_lm_hash[16]; uint8 first_8_lm_hash[16];
memcpy(first_8_lm_hash, lm_pw, 8); memcpy(first_8_lm_hash, lm_pw, 8);
memset(first_8_lm_hash + 8, '\0', 8); memset(first_8_lm_hash + 8, '\0', 8);
*user_sess_key = data_blob(first_8_lm_hash, 16); if (user_sess_key) {
*lm_sess_key = data_blob(first_8_lm_hash, 16); *user_sess_key = data_blob(first_8_lm_hash, 16);
}
if (lm_sess_key) {
*lm_sess_key = data_blob(first_8_lm_hash, 16);
}
} }
return NT_STATUS_OK; return NT_STATUS_OK;
} }