diff options
| author | mmcc <> | 2016-02-29 06:48:03 +0000 |
|---|---|---|
| committer | mmcc <> | 2016-02-29 06:48:03 +0000 |
| commit | 56b2a1e83cd0574481b7d0827ff3ec619fee95b3 (patch) | |
| tree | bd09bac67ee353cff71ad38b1e5e2926d68d65fd | |
| parent | 74e647f5a3f7cae827611541cd5ea1673fab91a1 (diff) | |
| download | openbsd-56b2a1e83cd0574481b7d0827ff3ec619fee95b3.tar.gz openbsd-56b2a1e83cd0574481b7d0827ff3ec619fee95b3.tar.bz2 openbsd-56b2a1e83cd0574481b7d0827ff3ec619fee95b3.zip | |
remove NULL checks for pqueue_free()
ok doug@
| -rw-r--r-- | src/lib/libssl/d1_lib.c | 17 | ||||
| -rw-r--r-- | src/lib/libssl/src/ssl/d1_lib.c | 17 |
2 files changed, 12 insertions, 22 deletions
diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c index 9ec9e090d2..23a7021d35 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.32 2015/10/07 13:20:48 bcook Exp $ */ | 1 | /* $OpenBSD: d1_lib.c,v 1.33 2016/02/29 06:48:03 mmcc 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. |
| @@ -125,16 +125,11 @@ dtls1_new(SSL *s) | |||
| 125 | if (!d1->unprocessed_rcds.q || !d1->processed_rcds.q || | 125 | if (!d1->unprocessed_rcds.q || !d1->processed_rcds.q || |
| 126 | !d1->buffered_messages || !d1->sent_messages || | 126 | !d1->buffered_messages || !d1->sent_messages || |
| 127 | !d1->buffered_app_data.q) { | 127 | !d1->buffered_app_data.q) { |
| 128 | if (d1->unprocessed_rcds.q) | 128 | pqueue_free(d1->unprocessed_rcds.q); |
| 129 | pqueue_free(d1->unprocessed_rcds.q); | 129 | pqueue_free(d1->processed_rcds.q); |
| 130 | if (d1->processed_rcds.q) | 130 | pqueue_free(d1->buffered_messages); |
| 131 | pqueue_free(d1->processed_rcds.q); | 131 | pqueue_free(d1->sent_messages); |
| 132 | if (d1->buffered_messages) | 132 | pqueue_free(d1->buffered_app_data.q); |
| 133 | pqueue_free(d1->buffered_messages); | ||
| 134 | if (d1->sent_messages) | ||
| 135 | pqueue_free(d1->sent_messages); | ||
| 136 | if (d1->buffered_app_data.q) | ||
| 137 | pqueue_free(d1->buffered_app_data.q); | ||
| 138 | free(d1); | 133 | free(d1); |
| 139 | ssl3_free(s); | 134 | ssl3_free(s); |
| 140 | return (0); | 135 | return (0); |
diff --git a/src/lib/libssl/src/ssl/d1_lib.c b/src/lib/libssl/src/ssl/d1_lib.c index 9ec9e090d2..23a7021d35 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.32 2015/10/07 13:20:48 bcook Exp $ */ | 1 | /* $OpenBSD: d1_lib.c,v 1.33 2016/02/29 06:48:03 mmcc 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. |
| @@ -125,16 +125,11 @@ dtls1_new(SSL *s) | |||
| 125 | if (!d1->unprocessed_rcds.q || !d1->processed_rcds.q || | 125 | if (!d1->unprocessed_rcds.q || !d1->processed_rcds.q || |
| 126 | !d1->buffered_messages || !d1->sent_messages || | 126 | !d1->buffered_messages || !d1->sent_messages || |
| 127 | !d1->buffered_app_data.q) { | 127 | !d1->buffered_app_data.q) { |
| 128 | if (d1->unprocessed_rcds.q) | 128 | pqueue_free(d1->unprocessed_rcds.q); |
| 129 | pqueue_free(d1->unprocessed_rcds.q); | 129 | pqueue_free(d1->processed_rcds.q); |
| 130 | if (d1->processed_rcds.q) | 130 | pqueue_free(d1->buffered_messages); |
| 131 | pqueue_free(d1->processed_rcds.q); | 131 | pqueue_free(d1->sent_messages); |
| 132 | if (d1->buffered_messages) | 132 | pqueue_free(d1->buffered_app_data.q); |
| 133 | pqueue_free(d1->buffered_messages); | ||
| 134 | if (d1->sent_messages) | ||
| 135 | pqueue_free(d1->sent_messages); | ||
| 136 | if (d1->buffered_app_data.q) | ||
| 137 | pqueue_free(d1->buffered_app_data.q); | ||
| 138 | free(d1); | 133 | free(d1); |
| 139 | ssl3_free(s); | 134 | ssl3_free(s); |
| 140 | return (0); | 135 | return (0); |