summaryrefslogtreecommitdiffstats
path: root/crypto/rsa
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-05-04 11:28:38 +0100
committerMatt Caswell <matt@openssl.org>2016-05-18 10:47:15 +0100
commit6ef020c988bb508842dfcd517a4b41cae214f641 (patch)
treec7cbc8c5fc0456b157c02c0a97fae580dab81b15 /crypto/rsa
parent24854e0117000b81319665154c93e15743bf7de6 (diff)
Better checks for malloc failure in various METHOD functions
A number of the METHOD functions weren't properly handling malloc failures. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/rsa')
-rw-r--r--crypto/rsa/rsa_meth.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/crypto/rsa/rsa_meth.c b/crypto/rsa/rsa_meth.c
index b0b38ccfa3..731164c561 100644
--- a/crypto/rsa/rsa_meth.c
+++ b/crypto/rsa/rsa_meth.c
@@ -16,6 +16,10 @@ RSA_METHOD *RSA_meth_new(const char *name, int flags)
if (meth != NULL) {
meth->name = OPENSSL_strdup(name);
+ if (meth->name == NULL) {
+ OPENSSL_free(meth);
+ return NULL;
+ }
meth->flags = flags;
}
@@ -40,6 +44,10 @@ RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth)
if (ret != NULL) {
memcpy(ret, meth, sizeof(*meth));
ret->name = OPENSSL_strdup(meth->name);
+ if (ret->name == NULL) {
+ OPENSSL_free(ret);
+ return NULL;
+ }
}
return ret;
@@ -52,10 +60,16 @@ const char *RSA_meth_get0_name(const RSA_METHOD *meth)
int RSA_meth_set1_name(RSA_METHOD *meth, const char *name)
{
+ char *tmpname;
+
+ tmpname = OPENSSL_strdup(name);
+ if (tmpname == NULL)
+ return 0;
+
OPENSSL_free(meth->name);
- meth->name = OPENSSL_strdup(name);
+ meth->name = tmpname;
- return meth->name != NULL;
+ return 1;
}
int RSA_meth_get_flags(RSA_METHOD *meth)