From 2a00e489122f6c4b525090dbdba2855a2ea2d519 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 20 Apr 2015 22:51:55 +0200
Subject: Upgraded to openssl 1.0.2a

---
 openssl/crypto/x509/x509_req.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'openssl/crypto/x509')

diff --git a/openssl/crypto/x509/x509_req.c b/openssl/crypto/x509/x509_req.c
index bc6e566c9..01795f4b3 100644
--- a/openssl/crypto/x509/x509_req.c
+++ b/openssl/crypto/x509/x509_req.c
@@ -92,6 +92,8 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
         goto err;
 
     pktmp = X509_get_pubkey(x);
+    if (pktmp == NULL)
+        goto err;
     i = X509_REQ_set_pubkey(ret, pktmp);
     EVP_PKEY_free(pktmp);
     if (!i)
-- 
cgit v1.2.3