diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-21 15:39:07 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-21 15:39:07 +0000 |
| commit | f69a489472a4a906255d5e82e1673a71bea52f5e (patch) | |
| tree | 4079a7e5a8d017e3a22a115b97c8c9aab67dd766 /epan/dissectors/packet-ntlmssp.c | |
| parent | 14fd3d0157be98e1798923fe96bd5ce06c5aade2 (diff) | |
NULL check ref_nt_challenge_response and ref_lm_challenge_response. Bug 9299 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9299)
From Matthieu Patou
svn path=/trunk/; revision=52732
Diffstat (limited to 'epan/dissectors/packet-ntlmssp.c')
| -rw-r--r-- | epan/dissectors/packet-ntlmssp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index b832264392..1db80707ad 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -712,7 +712,7 @@ create_ntlmssp_v1_key(const char *nt_password, const guint8 *serverchallenge, co md5_finish(&md5state, challenges_hash); memcpy(challenges_hash_first8, challenges_hash, 8); crypt_des_ecb_long(nt_challenge_response, nt_password_hash, challenges_hash_first8); - if (!memcmp(ref_nt_challenge_response, nt_challenge_response, 24)) { + if (ref_nt_challenge_response && !memcmp(ref_nt_challenge_response, nt_challenge_response, 24)) { found = TRUE; break; } @@ -726,7 +726,11 @@ create_ntlmssp_v1_key(const char *nt_password, const guint8 *serverchallenge, co else { crypt_des_ecb_long(lm_challenge_response, lm_password_hash, serverchallenge); } - if (!memcmp(ref_nt_challenge_response, nt_challenge_response, 24) && !memcmp(ref_lm_challenge_response, lm_challenge_response, 24)) { + if (ref_nt_challenge_response && + !memcmp(ref_nt_challenge_response, nt_challenge_response, 24) && + ref_lm_challenge_response && + !memcmp(ref_lm_challenge_response, lm_challenge_response, 24)) + { found = TRUE; } } |