diff options
author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-11-10 00:54:03 +0100 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-11-16 21:02:36 -0500 |
commit | a4905bf6423105cda266ea3dfa70c207b4b7c2ac (patch) | |
tree | 402a3e1e1aba3a16b265c1b70450b3512d9cd5f9 /crypto/dh | |
parent | c08ce19e7972d0e85833b257d74f1e460c4a8b8e (diff) |
Raise an error on memory alloc failure.
Both strdup or malloc failure should raise an err.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1905)
(cherry picked from commit bad6b116a2d3c005330e618c726f172fd0fefc2a)
Diffstat (limited to 'crypto/dh')
-rw-r--r-- | crypto/dh/dh_meth.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/crypto/dh/dh_meth.c b/crypto/dh/dh_meth.c index 45753b6164..ce6114c133 100644 --- a/crypto/dh/dh_meth.c +++ b/crypto/dh/dh_meth.c @@ -13,19 +13,20 @@ DH_METHOD *DH_meth_new(const char *name, int flags) { - DH_METHOD *dhm = OPENSSL_zalloc(sizeof(DH_METHOD)); + DH_METHOD *dhm = OPENSSL_zalloc(sizeof(*dhm)); if (dhm != NULL) { - dhm->name = OPENSSL_strdup(name); - if (dhm->name == NULL) { - OPENSSL_free(dhm); - DHerr(DH_F_DH_METH_NEW, ERR_R_MALLOC_FAILURE); - return NULL; - } dhm->flags = flags; + + dhm->name = OPENSSL_strdup(name); + if (dhm->name != NULL) + return dhm; + + OPENSSL_free(dhm); } - return dhm; + DHerr(DH_F_DH_METH_NEW, ERR_R_MALLOC_FAILURE); + return NULL; } void DH_meth_free(DH_METHOD *dhm) @@ -38,21 +39,20 @@ void DH_meth_free(DH_METHOD *dhm) DH_METHOD *DH_meth_dup(const DH_METHOD *dhm) { - DH_METHOD *ret; - - ret = OPENSSL_malloc(sizeof(DH_METHOD)); + DH_METHOD *ret = OPENSSL_malloc(sizeof(*ret)); if (ret != NULL) { memcpy(ret, dhm, sizeof(*dhm)); + ret->name = OPENSSL_strdup(dhm->name); - if (ret->name == NULL) { - OPENSSL_free(ret); - DHerr(DH_F_DH_METH_DUP, ERR_R_MALLOC_FAILURE); - return NULL; - } + if (ret->name != NULL) + return ret; + + OPENSSL_free(ret); } - return ret; + DHerr(DH_F_DH_METH_DUP, ERR_R_MALLOC_FAILURE); + return NULL; } const char *DH_meth_get0_name(const DH_METHOD *dhm) @@ -62,9 +62,8 @@ const char *DH_meth_get0_name(const DH_METHOD *dhm) int DH_meth_set1_name(DH_METHOD *dhm, const char *name) { - char *tmpname; + char *tmpname = OPENSSL_strdup(name); - tmpname = OPENSSL_strdup(name); if (tmpname == NULL) { DHerr(DH_F_DH_METH_SET1_NAME, ERR_R_MALLOC_FAILURE); return 0; |