Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fixed NULL pointer dereference. See PR#3321
- Loading branch information
Showing
with
4 additions
and
3 deletions.
-
+4
−3
ssl/s3_pkt.c
There are no files selected for viewing
|
|
@@ -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; |
|
|
|
|
|
|