diff options
| author | miod <> | 2014-07-11 13:09:04 +0000 |
|---|---|---|
| committer | miod <> | 2014-07-11 13:09:04 +0000 |
| commit | a69fbc6d8e8bdedf7ee40f85f0cfd17212e4bc9a (patch) | |
| tree | 5fe183b54ee37dae89a385b9f17043c9d83ec51d /src | |
| parent | 809e7af19de9c9fd7791601cd2de9319aeaa6d1a (diff) | |
| download | openbsd-a69fbc6d8e8bdedf7ee40f85f0cfd17212e4bc9a.tar.gz openbsd-a69fbc6d8e8bdedf7ee40f85f0cfd17212e4bc9a.tar.bz2 openbsd-a69fbc6d8e8bdedf7ee40f85f0cfd17212e4bc9a.zip | |
In dtls1_clear_queues(), free buffered_add_data.q correctly, it's made of
DTLS1_RECORD_DATA, not hm_fragment.
OpenSSL PR #3286 via OpenSSL trunk.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/d1_lib.c | 8 | ||||
| -rw-r--r-- | src/lib/libssl/src/ssl/d1_lib.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c index 10f55554e0..0539ad4287 100644 --- a/src/lib/libssl/d1_lib.c +++ b/src/lib/libssl/d1_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_lib.c,v 1.22 2014/07/09 11:10:51 bcook Exp $ */ | 1 | /* $OpenBSD: d1_lib.c,v 1.23 2014/07/11 13:09:04 miod Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -179,9 +179,9 @@ dtls1_clear_queues(SSL *s) | |||
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | while ((item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL) { | 181 | while ((item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL) { |
| 182 | frag = (hm_fragment *)item->data; | 182 | rdata = (DTLS1_RECORD_DATA *) item->data; |
| 183 | free(frag->fragment); | 183 | free(rdata->rbuf.buf); |
| 184 | free(frag); | 184 | free(item->data); |
| 185 | pitem_free(item); | 185 | pitem_free(item); |
| 186 | } | 186 | } |
| 187 | } | 187 | } |
diff --git a/src/lib/libssl/src/ssl/d1_lib.c b/src/lib/libssl/src/ssl/d1_lib.c index 10f55554e0..0539ad4287 100644 --- a/src/lib/libssl/src/ssl/d1_lib.c +++ b/src/lib/libssl/src/ssl/d1_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_lib.c,v 1.22 2014/07/09 11:10:51 bcook Exp $ */ | 1 | /* $OpenBSD: d1_lib.c,v 1.23 2014/07/11 13:09:04 miod Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -179,9 +179,9 @@ dtls1_clear_queues(SSL *s) | |||
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | while ((item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL) { | 181 | while ((item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL) { |
| 182 | frag = (hm_fragment *)item->data; | 182 | rdata = (DTLS1_RECORD_DATA *) item->data; |
| 183 | free(frag->fragment); | 183 | free(rdata->rbuf.buf); |
| 184 | free(frag); | 184 | free(item->data); |
| 185 | pitem_free(item); | 185 | pitem_free(item); |
| 186 | } | 186 | } |
| 187 | } | 187 | } |