generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

openssl: do not leak memory when handling errors

Browse Source 
,.. in aes_ctr_init().  Detected by Coverity.
This commit is contained in:
Kamil Dudka
2012-10-08 14:27:23 +02:00
parent a8cfc708c5
commit e2bb780d77
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openssl.c
View File

@@ -215,13 +215,10 @@ aes_ctr_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
* variable "c" is leaked from this scope, but is later freed * variable "c" is leaked from this scope, but is later freed
* in aes_ctr_cleanup * in aes_ctr_cleanup
*/ */
aes_ctr_ctx *c = malloc(sizeof(*c)); aes_ctr_ctx *c;
const EVP_CIPHER *aes_cipher; const EVP_CIPHER *aes_cipher;
(void) enc; (void) enc;
if (c == NULL)
return 0;
switch (ctx->key_len) { switch (ctx->key_len) {
case 16: case 16:
aes_cipher = EVP_aes_128_ecb(); aes_cipher = EVP_aes_128_ecb();
@@ -235,11 +232,20 @@ aes_ctr_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
default: default:
return 0; return 0;
} }
c->aes_ctx = malloc(sizeof(EVP_CIPHER_CTX));
if (c->aes_ctx == NULL) c = malloc(sizeof(*c));
if (c == NULL)
return 0; return 0;
c->aes_ctx = malloc(sizeof(EVP_CIPHER_CTX));
if (c->aes_ctx == NULL) {
free(c);
return 0;
}
if (EVP_EncryptInit(c->aes_ctx, aes_cipher, key, NULL) != 1) { if (EVP_EncryptInit(c->aes_ctx, aes_cipher, key, NULL) != 1) {
free(c->aes_ctx);
free(c);
return 0; return 0;
} }