From 7b06ac7593cf4cecfc2510989ed504d808a130b5 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 12 May 2014 00:38:37 +0100 Subject: [PATCH] Fixed NULL pointer dereference. See PR#3321 --- ssl/s3_pkt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index ad9dc5154a..5efc03e5ec 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -880,9 +880,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 */ @@ -898,6 +895,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; -- 2.50.1