public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't leak on an OPENSSL_realloc() failure

Browse source 
If OPENSSL_sk_insert() calls OPENSSL_realloc() and it fails, it was leaking
the originally allocated memory.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell 2016-09-21 15:49:28 +01:00
parent af58be768e
commit 41bff723c6
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crypto/stack/stack.c
View file

@ -126,6 +126,7 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
if (st->num_alloc <= (size_t)(st->num + 1)) {
size_t doub_num_alloc = st->num_alloc * 2;
const char **tmpdata;
/* Overflow checks */
if (doub_num_alloc < st->num_alloc)
@ -135,17 +136,12 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
if (doub_num_alloc > SIZE_MAX / sizeof(char *))
return 0;
st->data = OPENSSL_realloc((char *)st->data,
sizeof(char *) * doub_num_alloc);
if (st->data == NULL) {
/*
* Reset these counters to prevent subsequent operations on
* (now non-existing) heap memory
*/
st->num_alloc = 0;
st->num = 0;
tmpdata = OPENSSL_realloc((char *)st->data,
sizeof(char *) * doub_num_alloc);
if (tmpdata == NULL)
return 0;
}
st->data = tmpdata;
st->num_alloc = doub_num_alloc;
}
if ((loc >= st->num) || (loc < 0)) {