diff options
| author | Nicola Tuveri <nic.tuv@gmail.com> | 2018-09-05 12:08:12 +0300 |
|---|---|---|
| committer | Nicola Tuveri <nic.tuv@gmail.com> | 2018-09-05 15:22:35 +0300 |
| commit | 544648a8e07612449460ebc0e608a226fde38e67 (patch) | |
| tree | 48a0013ca27742ccfbb070723b0a3736fbb53cc2 /crypto/dh | |
| parent | 0c5d725ebf31ce7b6db9d638aab508da3263444d (diff) | |
| download | openssl-544648a8e07612449460ebc0e608a226fde38e67.zip openssl-544648a8e07612449460ebc0e608a226fde38e67.tar.gz openssl-544648a8e07612449460ebc0e608a226fde38e67.tar.bz2 | |
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)
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh_lib.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c index 2e0393e..962f864 100644 --- a/crypto/dh/dh_lib.c +++ b/crypto/dh/dh_lib.c @@ -83,12 +83,14 @@ DH *DH_new_method(ENGINE *engine) if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { DHerr(DH_F_DH_NEW_METHOD, ERR_R_INIT_FAIL); -err: - DH_free(ret); - ret = NULL; + goto err; } return ret; + + err: + DH_free(ret); + return NULL; } void DH_free(DH *r) |