From 8343e6b6b245e38ea1584ece7c533e807709de5b Mon Sep 17 00:00:00 2001 From: David Ramos Date: Sun, 1 Jun 2014 21:42:47 +0100 Subject: [PATCH] Delays the queue insertion until after the ssl3_setup_buffers() call due to use-after-free bug. PR#3362 --- ssl/d1_pkt.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index cbefaecf8f..5d0075cca8 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -231,13 +231,6 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) item->data = rdata; - /* 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_length = 0; @@ -251,6 +244,14 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) pitem_free(item); 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); } -- 2.34.1