summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-01-04 14:51:04 -0500
committerRich Salz <rsalz@openssl.org>2015-01-04 14:52:01 -0500
commit9f49067c9e6fbd38dab2cb2cfbedf10300a95901 (patch)
tree3f00fb21185384aaad146f3abaf99c8b4f799af4
parent5396c1190fe7c95b71d5d091c31d0fd6d65bb2ff (diff)
RT2914: NULL check missing in X509_name_canon
Check for NULL return from X509_NAME_ENTRY_new() Reviewed-by: Dr. Stephen Henson <steve@openssl.org> (cherry picked from commit 2c60925d1ccc0b96287bdc9acb90198e7180d642)
-rw-r--r--crypto/asn1/x_name.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/asn1/x_name.c b/crypto/asn1/x_name.c
index d7c2318693..22da57040e 100644
--- a/crypto/asn1/x_name.c
+++ b/crypto/asn1/x_name.c
@@ -350,6 +350,8 @@ static int x509_name_canon(X509_NAME *a)
set = entry->set;
}
tmpentry = X509_NAME_ENTRY_new();
+ if (!tmpentry)
+ goto err;
tmpentry->object = OBJ_dup(entry->object);
if (!asn1_string_canon(tmpentry->value, entry->value))
goto err;