diff options
author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-11-10 00:54:03 +0100 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-11-16 20:54:53 -0500 |
commit | bad6b116a2d3c005330e618c726f172fd0fefc2a (patch) | |
tree | 04e55baa168ecd38a941c59f28300cd7f579efe5 /crypto/rsa | |
parent | 2d13250fd695eba777fe7e2af4beb1b7d356bd8f (diff) | |
download | openssl-bad6b116a2d3c005330e618c726f172fd0fefc2a.tar.gz |
Raise an error on memory alloc failure.
Both strdup or malloc failure should raise à err.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1905)
Diffstat (limited to 'crypto/rsa')
-rw-r--r-- | crypto/rsa/rsa_meth.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/crypto/rsa/rsa_meth.c b/crypto/rsa/rsa_meth.c index ef0dc9751f..9480abd700 100644 --- a/crypto/rsa/rsa_meth.c +++ b/crypto/rsa/rsa_meth.c @@ -13,19 +13,20 @@ RSA_METHOD *RSA_meth_new(const char *name, int flags) { - RSA_METHOD *meth = OPENSSL_zalloc(sizeof(RSA_METHOD)); + RSA_METHOD *meth = OPENSSL_zalloc(sizeof(*meth)); if (meth != NULL) { - meth->name = OPENSSL_strdup(name); - if (meth->name == NULL) { - OPENSSL_free(meth); - RSAerr(RSA_F_RSA_METH_NEW, ERR_R_MALLOC_FAILURE); - return NULL; - } meth->flags = flags; + + meth->name = OPENSSL_strdup(name); + if (meth->name != NULL) + return meth; + + OPENSSL_free(meth); } - return meth; + RSAerr(RSA_F_RSA_METH_NEW, ERR_R_MALLOC_FAILURE); + return NULL; } void RSA_meth_free(RSA_METHOD *meth) @@ -38,21 +39,20 @@ void RSA_meth_free(RSA_METHOD *meth) RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth) { - RSA_METHOD *ret; - - ret = OPENSSL_malloc(sizeof(RSA_METHOD)); + RSA_METHOD *ret = OPENSSL_malloc(sizeof(*ret)); if (ret != NULL) { memcpy(ret, meth, sizeof(*meth)); + ret->name = OPENSSL_strdup(meth->name); - if (ret->name == NULL) { - OPENSSL_free(ret); - RSAerr(RSA_F_RSA_METH_DUP, ERR_R_MALLOC_FAILURE); - return NULL; - } + if (ret->name != NULL) + return ret; + + OPENSSL_free(ret); } - return ret; + RSAerr(RSA_F_RSA_METH_DUP, ERR_R_MALLOC_FAILURE); + return NULL; } const char *RSA_meth_get0_name(const RSA_METHOD *meth) @@ -62,9 +62,8 @@ const char *RSA_meth_get0_name(const RSA_METHOD *meth) int RSA_meth_set1_name(RSA_METHOD *meth, const char *name) { - char *tmpname; + char *tmpname = OPENSSL_strdup(name); - tmpname = OPENSSL_strdup(name); if (tmpname == NULL) { RSAerr(RSA_F_RSA_METH_SET1_NAME, ERR_R_MALLOC_FAILURE); return 0; |