From 9f0928c6593f937a17b7974b04051c57e3874b20 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 12 Feb 2015 22:22:25 +0100
Subject: Update OpenSSL to AOSP -master

---
 main/openssl/crypto/asn1/x_name.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'main/openssl/crypto/asn1/x_name.c')

diff --git a/main/openssl/crypto/asn1/x_name.c b/main/openssl/crypto/asn1/x_name.c
index d7c23186..22da5704 100644
--- a/main/openssl/crypto/asn1/x_name.c
+++ b/main/openssl/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;
-- 
cgit v1.2.3