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

Fix memory leak.

Browse Source 
Fix memory leak by freeing up saved_message.data if it is not NULL.

PR#3489
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>

(cherry picked from commit 41cd41c4416f545a18ead37e09e437c75fa07c95)
This commit is contained in:
Martin Brejcha 2014-11-16 17:04:40 +00:00 committed by Dr. Stephen Henson
parent cb951e336b
commit 61052e891e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/bio/bss_dgram.c
View File

@ -1046,7 +1046,12 @@ static int dgram_sctp_free(BIO *a)
return 0; return 0;
data = (bio_dgram_sctp_data *)a->ptr; data = (bio_dgram_sctp_data *)a->ptr;
if(data != NULL) OPENSSL_free(data); if(data != NULL)
{
if(data->saved_message.data != NULL)
OPENSSL_free(data->saved_message.data);
OPENSSL_free(data);
}
return(1); return(1);
} }
@ -1163,6 +1168,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
dgram_sctp_write(data->saved_message.bio, data->saved_message.data, dgram_sctp_write(data->saved_message.bio, data->saved_message.data,
data->saved_message.length); data->saved_message.length);
OPENSSL_free(data->saved_message.data); OPENSSL_free(data->saved_message.data);
data->saved_message.data = NULL;
data->saved_message.length = 0; data->saved_message.length = 0;
} }
@ -1334,9 +1340,11 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b))
{ {
data->saved_message.bio = b; data->saved_message.bio = b;
data->saved_message.length = inl; if (data->saved_message.data)
OPENSSL_free(data->saved_message.data);
data->saved_message.data = OPENSSL_malloc(inl); data->saved_message.data = OPENSSL_malloc(inl);
memcpy(data->saved_message.data, in, inl); memcpy(data->saved_message.data, in, inl);
data->saved_message.length = inl;
return inl; return inl;
} }