diff options
| author | Mouse <mouse008@gmail.com> | 2016-01-01 23:30:02 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-01-13 01:23:34 +0100 |
| commit | ad81ca9061506482bf40c9dd17097814c3ce75b2 (patch) | |
| tree | 3aa2ade1bf52609d699517a6d33b87c6cfb0dd09 | |
| parent | d65a8d0b7e4b95e79c65972eaa05ba776c5af462 (diff) | |
Fixed crash (SIGSEGV) when freeing of ex_data stumbles upon a NULL-pointer.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | crypto/ex_data.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/ex_data.c b/crypto/ex_data.c index f96a51781a..25e79dc2aa 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -522,8 +522,9 @@ static void int_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad) for (i = 0; i < mx; i++) { if (storage[i] && storage[i]->free_func) { ptr = CRYPTO_get_ex_data(ad, i); - storage[i]->free_func(obj, ptr, ad, i, - storage[i]->argl, storage[i]->argp); + if (ptr) + storage[i]->free_func(obj, ptr, ad, i, + storage[i]->argl, storage[i]->argp); } } if (storage) |