Commit 7b06ac75 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fixed NULL pointer dereference. See PR#3321

parent 3b3ecce1

ssl/s3_pkt.c

+4 −3
Original line number Diff line number Diff line
@@ -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;