diff options
| author | jkim <jkim@FreeBSD.org> | 2014-06-09 06:00:28 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-06-09 06:00:28 +0000 |
| commit | 309e057bcfb01861779d20e3ce027661dcae0910 (patch) | |
| tree | 806791a3db00c226152a7ed55c647916c51c974b /crypto/openssl/ssl/d1_pkt.c | |
| parent | 679c7dcca69d7c267e21eb3b50c5cfa2e1f53f35 (diff) | |
| download | FreeBSD-src-309e057bcfb01861779d20e3ce027661dcae0910.zip FreeBSD-src-309e057bcfb01861779d20e3ce027661dcae0910.tar.gz | |
MFC: r267256
Merge OpenSSL 1.0.1h.
Approved by: so (delphij)
Diffstat (limited to 'crypto/openssl/ssl/d1_pkt.c')
| -rw-r--r-- | crypto/openssl/ssl/d1_pkt.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/crypto/openssl/ssl/d1_pkt.c b/crypto/openssl/ssl/d1_pkt.c index 8186462..438c091 100644 --- a/crypto/openssl/ssl/d1_pkt.c +++ b/crypto/openssl/ssl/d1_pkt.c @@ -239,14 +239,6 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) } #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_length = 0; memset(&(s->s3->rbuf), 0, sizeof(SSL3_BUFFER)); @@ -259,7 +251,16 @@ 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) + { + SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR); + OPENSSL_free(rdata); + pitem_free(item); + return(0); + } + return(1); } |
