diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2020-07-02 11:45:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 11:45:16 +0100 |
| commit | 8720ae8a2c9045cb9494d328e3fc6370decbb774 (patch) | |
| tree | 955726b1af7104ea71e7bc363932f477a7e93f5d | |
| parent | d6c62852076005053be9169cb4f3cd9cf9db2aea (diff) | |
| parent | 7c964416fb90d8c3cefadf036264880e6c7040f7 (diff) | |
| download | libgit2-8720ae8a2c9045cb9494d328e3fc6370decbb774.tar.gz | |
Merge pull request #5571 from lhchavez/ntlmclient-sanitizers
Make NTLMClient Memory and UndefinedBehavior Sanitizer-clean
| -rw-r--r-- | deps/ntlmclient/ntlm.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/deps/ntlmclient/ntlm.c b/deps/ntlmclient/ntlm.c index 24b08f658..74224bbea 100644 --- a/deps/ntlmclient/ntlm.c +++ b/deps/ntlmclient/ntlm.c @@ -47,11 +47,9 @@ ntlm_client *ntlm_client_init(ntlm_client_flags flags) { ntlm_client *ntlm = NULL; - if ((ntlm = malloc(sizeof(ntlm_client))) == NULL) + if ((ntlm = calloc(1, sizeof(ntlm_client))) == NULL) return NULL; - memset(ntlm, 0, sizeof(ntlm_client)); - ntlm->flags = flags; if ((ntlm->hmac_ctx = ntlm_hmac_ctx_init()) == NULL || @@ -260,6 +258,9 @@ static inline bool write_buf( const unsigned char *buf, size_t len) { + if (!len) + return true; + if (out->len - out->pos < len) { ntlm_client_set_errmsg(ntlm, "out of buffer space"); return false; @@ -648,13 +649,11 @@ int ntlm_client_negotiate( return -1; } - if ((ntlm->negotiate.buf = malloc(ntlm->negotiate.len)) == NULL) { + if ((ntlm->negotiate.buf = calloc(1, ntlm->negotiate.len)) == NULL) { ntlm_client_set_errmsg(ntlm, "out of memory"); return -1; } - memset(ntlm->negotiate.buf, 0, ntlm->negotiate.len); - if (!write_buf(ntlm, &ntlm->negotiate, ntlm_client_signature, sizeof(ntlm_client_signature)) || !write_int32(ntlm, &ntlm->negotiate, 1) || @@ -1122,7 +1121,7 @@ static bool generate_ntlm2_challengehash( static bool generate_lm2_response(ntlm_client *ntlm, unsigned char ntlm2_hash[NTLM_NTLM2_HASH_LEN]) { - unsigned char lm2_challengehash[16]; + unsigned char lm2_challengehash[16] = {0}; size_t lm2_len = 16; uint64_t local_nonce; @@ -1177,7 +1176,7 @@ static bool generate_ntlm2_response(ntlm_client *ntlm) uint32_t signature; uint64_t timestamp, nonce; unsigned char ntlm2_hash[NTLM_NTLM2_HASH_LEN]; - unsigned char challengehash[16]; + unsigned char challengehash[16] = {0}; unsigned char *blob; if (!generate_timestamp(ntlm) || @@ -1334,13 +1333,11 @@ int ntlm_client_response( return -1; } - if ((ntlm->response.buf = malloc(ntlm->response.len)) == NULL) { + if ((ntlm->response.buf = calloc(1, ntlm->response.len)) == NULL) { ntlm_client_set_errmsg(ntlm, "out of memory"); return -1; } - memset(ntlm->response.buf, 0, ntlm->response.len); - if (!write_buf(ntlm, &ntlm->response, ntlm_client_signature, sizeof(ntlm_client_signature)) || !write_int32(ntlm, &ntlm->response, 3) || |