From 3599587ae793583e28ee9f173cd8fd9a871306f3 Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Thu, 22 Sep 2016 15:55:27 +0000
Subject: MFS:	r306195

Merge OpenSSL 1.0.2i.

Approved by:	re (gjb, implicit), so (delphij)
---
 crypto/openssl/crypto/ui/ui_lib.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'crypto/openssl/crypto/ui')

diff --git a/crypto/openssl/crypto/ui/ui_lib.c b/crypto/openssl/crypto/ui/ui_lib.c
index 2f58035..d25b4f3 100644
--- a/crypto/openssl/crypto/ui/ui_lib.c
+++ b/crypto/openssl/crypto/ui/ui_lib.c
@@ -413,6 +413,8 @@ char *UI_construct_prompt(UI *ui, const char *object_desc,
         len += sizeof(prompt3) - 1;
 
         prompt = (char *)OPENSSL_malloc(len + 1);
+        if (prompt == NULL)
+            return NULL;
         BUF_strlcpy(prompt, prompt1, len + 1);
         BUF_strlcat(prompt, object_desc, len + 1);
         if (object_name) {
-- 
cgit v1.1