diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
| commit | 576b0c26baf9b5b1418650a572604325ca7fb3af (patch) | |
| tree | 8b2986d66ed4e6bdf5a3253c81f32cc5a8e53b99 /app/openssl/ssl/d1_pkt.c | |
| parent | bbf877a099112acbf34589b01503c3f5ee135dc0 (diff) | |
| parent | 48cd0f2fa3094b5a6b7b07d6413d77bdbc9bbc20 (diff) | |
Merge branch 'develop'0.8.0
Diffstat (limited to 'app/openssl/ssl/d1_pkt.c')
| -rw-r--r-- | app/openssl/ssl/d1_pkt.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/openssl/ssl/d1_pkt.c b/app/openssl/ssl/d1_pkt.c index 5b84e97c..363fc8c8 100644 --- a/app/openssl/ssl/d1_pkt.c +++ b/app/openssl/ssl/d1_pkt.c @@ -241,14 +241,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)); @@ -261,7 +253,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); } |