Commit a842be9c authored Sep 05, 2018 by Nicola Tuveri

Harmonize the error handling codepath



Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7121)

parent c28a2ffd

crypto/dh/dh_lib.c

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -82,12 +82,14 @@ DH DH_new_method(ENGINE engine)

	if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {		if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
	DHerr(DH_F_DH_NEW_METHOD, ERR_R_INIT_FAIL);		DHerr(DH_F_DH_NEW_METHOD, ERR_R_INIT_FAIL);
	err:		goto err;
	DH_free(ret);
	ret = NULL;
	}		}

	return ret;		return ret;

			err:
			DH_free(ret);
			return NULL;
	}		}

	void DH_free(DH *r)		void DH_free(DH *r)

crypto/dsa/dsa_lib.c

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -91,12 +91,14 @@ DSA DSA_new_method(ENGINE engine)

	if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {		if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
	DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_INIT_FAIL);		DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_INIT_FAIL);
	err:		goto err;
	DSA_free(ret);
	ret = NULL;
	}		}

	return ret;		return ret;

			err:
			DSA_free(ret);
			return NULL;
	}		}

	void DSA_free(DSA *r)		void DSA_free(DSA *r)

crypto/rsa/rsa_lib.c

+1 −1

File changed.

Contains only whitespace changes.

crypto/ec/ec_kmeth.c

+1 −1

File changed.

Contains only whitespace changes.