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

Delays the queue insertion until after the ssl3_setup_buffers() call due to use-after-free bug. PR#3362

Browse Source
This commit is contained in:
David Ramos 2014-06-01 21:28:41 +01:00 committed by Matt Caswell
parent 8d71574142
commit 8de85b0048
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssl/d1_pkt.c
View File

@ -239,14 +239,6 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
} }
#endif #endif
/* insert should not fail, since duplicates are dropped */
if (pqueue_insert(queue->q, item) == NULL)
{
OPENSSL_free(rdata);
pitem_free(item);
return(0);
}
s->packet = NULL; s->packet = NULL;
s->packet_length = 0; s->packet_length = 0;
memset(&(s->s3->rbuf), 0, sizeof(SSL3_BUFFER)); memset(&(s->s3->rbuf), 0, sizeof(SSL3_BUFFER));
@ -259,7 +251,15 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
pitem_free(item); pitem_free(item);
return(0); return(0);
} }
/* insert should not fail, since duplicates are dropped */
if (pqueue_insert(queue->q, item) == NULL)
{
OPENSSL_free(rdata);
pitem_free(item);
return(0);
}
return(1); return(1);
} }