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

GH715: Missed some null-check-removals. follow commits 412bafdcf5, and 7c96dbcdab

Browse Source 
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
FdaSilvaYY 2016-02-28 16:01:41 +01:00 committed by Rich Salz
parent 31ba0e1758
commit 17fa4e8eda
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/dsa/dsa_lib.c
View File

@ -144,8 +144,7 @@ DSA *DSA_new_method(ENGINE *engine)
CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data); CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data);
if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
if (ret->engine) ENGINE_finish(ret->engine);
ENGINE_finish(ret->engine);
#endif #endif
CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data); CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data);
OPENSSL_free(ret); OPENSSL_free(ret);
@ -171,8 +170,7 @@ void DSA_free(DSA *r)
if (r->meth->finish) if (r->meth->finish)
r->meth->finish(r); r->meth->finish(r);
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
if (r->engine) ENGINE_finish(r->engine);
ENGINE_finish(r->engine);
#endif #endif
CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, r, &r->ex_data); CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, r, &r->ex_data);