From: Matt Caswell <matt@openssl.org>
Date: Sun, 11 May 2014 23:38:37 +0000 (+0100)
Subject: Fixed NULL pointer dereference. See PR#3321
X-Git-Tag: OpenSSL_1_0_2-beta2~217
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f710c3f198c9980a1056bac9b4b9617554254671;p=oweals%2Fopenssl.git

Fixed NULL pointer dereference. See PR#3321
---

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 8a23de5f34..d0f3c764a3 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -841,9 +841,6 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
 	SSL3_BUFFER *wb=&(s->s3->wbuf);
 	SSL_SESSION *sess;
 
- 	if (wb->buf == NULL)
-		if (!ssl3_setup_write_buffer(s))
-			return -1;
 
 	/* first check if there is a SSL3_BUFFER still being written
 	 * out.  This will happen with non blocking IO */
@@ -859,6 +856,10 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
 		/* if it went, fall through and send more stuff */
 		}
 
+ 	if (wb->buf == NULL)
+		if (!ssl3_setup_write_buffer(s))
+			return -1;
+
 	if (len == 0 && !create_empty_fragment)
 		return 0;