From: Rich Salz <rsalz@openssl.org>
Date: Sun, 4 Jan 2015 19:51:04 +0000 (-0500)
Subject: RT2914: NULL check missing in X509_name_canon
X-Git-Tag: OpenSSL_1_0_1k~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9e9ee7e37f3da6f5c8aecfee9a2919d417842890;p=oweals%2Fopenssl.git

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

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;