aboutsummaryrefslogtreecommitdiff
path: root/crypto/x509/x_name.c
diff options
context:
space:
mode:
authorFdaSilvaYY <fdasilvayy@gmail.com>2016-06-04 00:14:52 +0200
committerRich Salz <rsalz@openssl.org>2016-06-18 16:30:24 -0400
commit5ab0b7e6263ab0ff666133cefbf1e4d1f91e867d (patch)
tree3039f6cd20af9130699c24124d039b452f5338e1 /crypto/x509/x_name.c
parentb1b1cba4e2ae76bc3b8390842c8482dc0b3358ca (diff)
downloadopenssl-5ab0b7e6263ab0ff666133cefbf1e4d1f91e867d.zip
openssl-5ab0b7e6263ab0ff666133cefbf1e4d1f91e867d.tar.gz
openssl-5ab0b7e6263ab0ff666133cefbf1e4d1f91e867d.tar.bz2
Missing NULL check on OBJ_dup result in x509_name_canon
Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1168)
Diffstat (limited to 'crypto/x509/x_name.c')
-rw-r--r--crypto/x509/x_name.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index 5c624cb..d5b12f1 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -322,6 +322,8 @@ static int x509_name_canon(X509_NAME *a)
if (tmpentry == NULL)
goto err;
tmpentry->object = OBJ_dup(entry->object);
+ if (tmpentry->object == NULL)
+ goto err;
if (!asn1_string_canon(tmpentry->value, entry->value))
goto err;
if (!sk_X509_NAME_ENTRY_push(entries, tmpentry))