From 865528271ad24e7de608608ae5382b0ab6a0041b Mon Sep 17 00:00:00 2001
From: delphij <delphij@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 13 May 2014 23:19:16 +0000
Subject: [PATCH] Fix OpenSSL NULL pointer deference vulnerability.

Obtained from:	OpenBSD
Security:	FreeBSD-SA-14:09.openssl
Security:	CVE-2014-0198


git-svn-id: svn://svn.freebsd.org/base/stable/10@265986 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 crypto/openssl/ssl/s3_pkt.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/openssl/ssl/s3_pkt.c b/crypto/openssl/ssl/s3_pkt.c
index 8deeab3c9..1b1613e6c 100644
--- a/crypto/openssl/ssl/s3_pkt.c
+++ b/crypto/openssl/ssl/s3_pkt.c
@@ -657,6 +657,10 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
 		if (i <= 0)
 			return(i);
 		/* if it went, fall through and send more stuff */
+		/* we may have released our buffer, so get it again */
+		if (wb->buf == NULL)
+			if (!ssl3_setup_write_buffer(s))
+				return -1;
 		}
 
 	if (len == 0 && !create_empty_fragment)
-- 
2.45.0