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

GH715: Missed some null-check-removals.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz
2016-02-25 16:34:27 -05:00
committed by Rich Salz
parent 91a61513a8
commit 412bafdcf5
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/rsa/rsa_lib.c
View File

@@ -154,8 +154,7 @@ RSA *RSA_new_method(ENGINE *engine)
ret->flags = ret->meth->flags & ~RSA_FLAG_NON_FIPS_ALLOW; ret->flags = ret->meth->flags & ~RSA_FLAG_NON_FIPS_ALLOW;
if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data)) { if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data)) {
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
if (ret->engine) ENGINE_finish(ret->engine);
ENGINE_finish(ret->engine);
#endif #endif
OPENSSL_free(ret); OPENSSL_free(ret);
return (NULL); return (NULL);
@@ -163,8 +162,7 @@ RSA *RSA_new_method(ENGINE *engine)
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_RSA, ret, &ret->ex_data); CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data);
OPENSSL_free(ret); OPENSSL_free(ret);
@@ -189,8 +187,7 @@ void RSA_free(RSA *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_RSA, r, &r->ex_data); CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, r, &r->ex_data);