From: FdaSilvaYY <fdasilvayy@gmail.com>
Date: Fri, 3 Jun 2016 22:14:52 +0000 (+0200)
Subject: Missing NULL check on OBJ_dup result in x509_name_canon
X-Git-Tag: OpenSSL_1_1_0-pre6~405
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5ab0b7e6263ab0ff666133cefbf1e4d1f91e867d;p=oweals%2Fopenssl.git

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)
---

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index 5c624cbd17..d5b12f1421 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))