From 8788fb97a89181a538032af361343195f81e4f1e Mon Sep 17 00:00:00 2001 From: Mouse Date: Tue, 12 Jan 2016 09:09:48 -0500 Subject: Root cause discovered and fixed, this fix became unnecessary Reviewed-by: Rich Salz Reviewed-by: Richard Levitte --- crypto/ex_data.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crypto/ex_data.c b/crypto/ex_data.c index 25e79dc2aa..f96a51781a 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -522,9 +522,8 @@ 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); - if (ptr) - storage[i]->free_func(obj, ptr, ad, i, - storage[i]->argl, storage[i]->argp); + storage[i]->free_func(obj, ptr, ad, i, + storage[i]->argl, storage[i]->argp); } } if (storage) -- cgit v1.2.3