summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMouse <mouse008@gmail.com>2016-01-12 09:09:48 -0500
committerRichard Levitte <levitte@openssl.org>2016-01-13 01:23:34 +0100
commit8788fb97a89181a538032af361343195f81e4f1e (patch)
treec34e22748c0342b41be93b7520c08ab3520accd3
parent6fa6a6628514dbf892c68442fab54f7476f3c703 (diff)
Root cause discovered and fixed, this fix became unnecessary
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--crypto/ex_data.c5
1 files 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)