From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 10 Jun 2014 13:47:29 +0000 (+0100)
Subject: Fix null pointer errors.
X-Git-Tag: OpenSSL_1_0_1i~97
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa59369b4ca279d9896d45085e229d9803ad45eb;p=oweals%2Fopenssl.git

Fix null pointer errors.

PR#3394
(cherry picked from commit 7a9d59c148b773f59a41f8697eeecf369a0974c2)
---

diff --git a/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c
index af5fc16691..b4126ade51 100644
--- a/crypto/ocsp/ocsp_ht.c
+++ b/crypto/ocsp/ocsp_ht.c
@@ -490,6 +490,9 @@ OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req)
 
 	ctx = OCSP_sendreq_new(b, path, req, -1);
 
+	if (!ctx)
+		return NULL;
+
 	do
 		{
 		rv = OCSP_sendreq_nbio(&resp, ctx);
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 04aa23107e..c1eb970a86 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1180,6 +1180,8 @@ dtls1_buffer_message(SSL *s, int is_ccs)
 	OPENSSL_assert(s->init_off == 0);
 
 	frag = dtls1_hm_fragment_new(s->init_num, 0);
+	if (!frag)
+		return 0;
 
 	memcpy(frag->fragment, s->init_buf->data, s->init_num);