generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix seg fault in dtls1_new

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2015-02-03 16:11:49 +00:00
parent cb2ce7abfd
commit 5fb6f80cdf
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssl/d1_lib.c
View File

@ -124,6 +124,10 @@ int dtls1_new(SSL *s)
{ {
DTLS1_STATE *d1; DTLS1_STATE *d1;
if(!DTLS_RECORD_LAYER_new(&s->rlayer)) {
return 0;
}
if (!ssl3_new(s)) if (!ssl3_new(s))
return (0); return (0);
if ((d1 = OPENSSL_malloc(sizeof *d1)) == NULL) { if ((d1 = OPENSSL_malloc(sizeof *d1)) == NULL) {
@ -131,12 +135,6 @@ int dtls1_new(SSL *s)
return (0); return (0);
} }
memset(d1, 0, sizeof *d1); memset(d1, 0, sizeof *d1);
if(!DTLS_RECORD_LAYER_new(&s->rlayer)) {
OPENSSL_free(d1);
ssl3_free(s);
return 0;
}
d1->buffered_messages = pqueue_new(); d1->buffered_messages = pqueue_new();
d1->sent_messages = pqueue_new(); d1->sent_messages = pqueue_new();

3
ssl/record/d1_pkt.c
View File

@ -133,8 +133,7 @@ int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl)
rl->d = d; rl->d = d;
DTLS_RECORD_LAYER_clear(rl);
d->unprocessed_rcds.q = pqueue_new(); d->unprocessed_rcds.q = pqueue_new();
d->processed_rcds.q = pqueue_new(); d->processed_rcds.q = pqueue_new();

6
ssl/record/s3_pkt.c
View File

@ -145,8 +145,10 @@ void RECORD_LAYER_clear(RECORD_LAYER *rl)
size_t rlen, wlen; size_t rlen, wlen;
int read_ahead; int read_ahead;
SSL *s; SSL *s;
DTLS_RECORD_LAYER *d;
s = rl->s; s = rl->s;
d = rl->d;
read_ahead = rl->read_ahead; read_ahead = rl->read_ahead;
rp = SSL3_BUFFER_get_buf(&rl->rbuf); rp = SSL3_BUFFER_get_buf(&rl->rbuf);
rlen = SSL3_BUFFER_get_len(&rl->rbuf); rlen = SSL3_BUFFER_get_len(&rl->rbuf);
@ -165,6 +167,10 @@ void RECORD_LAYER_clear(RECORD_LAYER *rl)
rl->read_ahead = read_ahead; rl->read_ahead = read_ahead;
rl->rstate = SSL_ST_READ_HEADER; rl->rstate = SSL_ST_READ_HEADER;
rl->s = s; rl->s = s;
rl->d = d;
if(d)
DTLS_RECORD_LAYER_clear(rl);
} }
void RECORD_LAYER_release(RECORD_LAYER *rl) void RECORD_LAYER_release(RECORD_LAYER *rl)