lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

dh: Avoid possible memory leaks with realloc.

Browse Source
This commit is contained in:
Andreas Schneider
2013-11-09 13:20:13 +01:00
parent 387e26c837
commit 6d7bbe63fe
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/dh.c
View File

@@ -869,6 +869,7 @@ int generate_session_keys(ssh_session session) {
ssh_string k_string = NULL; ssh_string k_string = NULL;
ssh_mac_ctx ctx = NULL; ssh_mac_ctx ctx = NULL;
struct ssh_crypto_struct *crypto = session->next_crypto; struct ssh_crypto_struct *crypto = session->next_crypto;
unsigned char *tmp;
int rc = -1; int rc = -1;
k_string = make_bignum_string(crypto->k); k_string = make_bignum_string(crypto->k);
@@ -924,9 +925,12 @@ int generate_session_keys(ssh_session session) {
/* some ciphers need more than DIGEST_LEN bytes of input key */ /* some ciphers need more than DIGEST_LEN bytes of input key */
if (crypto->out_cipher->keysize > crypto->digest_len * 8) { if (crypto->out_cipher->keysize > crypto->digest_len * 8) {
crypto->encryptkey = realloc(crypto->encryptkey, crypto->digest_len * 2); tmp = realloc(crypto->encryptkey, crypto->digest_len * 2);
if(crypto->encryptkey == NULL) if (tmp == NULL) {
goto error; goto error;
}
crypto->encryptkey = tmp;
ctx = ssh_mac_ctx_init(crypto->mac_type); ctx = ssh_mac_ctx_init(crypto->mac_type);
if (ctx == NULL) { if (ctx == NULL) {
goto error; goto error;
@@ -939,7 +943,12 @@ int generate_session_keys(ssh_session session) {
} }
if (crypto->in_cipher->keysize > crypto->digest_len * 8) { if (crypto->in_cipher->keysize > crypto->digest_len * 8) {
crypto->decryptkey = realloc(crypto->decryptkey, crypto->digest_len *2); tmp = realloc(crypto->decryptkey, crypto->digest_len *2);
if (tmp == NULL) {
goto error;
}
tmp = crypto->decryptkey;
if(crypto->decryptkey == NULL) if(crypto->decryptkey == NULL)
goto error; goto error;
ctx = ssh_mac_ctx_init(crypto->mac_type); ctx = ssh_mac_ctx_init(crypto->mac_type);