From a4e04e82bbad45ca808382ab66ae55bd7e68ac4a Mon Sep 17 00:00:00 2001 From: mmcc Date: Mon, 29 Feb 2016 06:48:04 +0000 Subject: remove NULL checks for pqueue_free() ok doug@ --- lib/libssl/src/ssl/d1_lib.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/libssl/src/ssl/d1_lib.c b/lib/libssl/src/ssl/d1_lib.c index 9ec9e090d21..23a7021d356 100644 --- a/lib/libssl/src/ssl/d1_lib.c +++ b/lib/libssl/src/ssl/d1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_lib.c,v 1.32 2015/10/07 13:20:48 bcook Exp $ */ +/* $OpenBSD: d1_lib.c,v 1.33 2016/02/29 06:48:03 mmcc Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -125,16 +125,11 @@ dtls1_new(SSL *s) if (!d1->unprocessed_rcds.q || !d1->processed_rcds.q || !d1->buffered_messages || !d1->sent_messages || !d1->buffered_app_data.q) { - if (d1->unprocessed_rcds.q) - pqueue_free(d1->unprocessed_rcds.q); - if (d1->processed_rcds.q) - pqueue_free(d1->processed_rcds.q); - if (d1->buffered_messages) - pqueue_free(d1->buffered_messages); - if (d1->sent_messages) - pqueue_free(d1->sent_messages); - if (d1->buffered_app_data.q) - pqueue_free(d1->buffered_app_data.q); + pqueue_free(d1->unprocessed_rcds.q); + pqueue_free(d1->processed_rcds.q); + pqueue_free(d1->buffered_messages); + pqueue_free(d1->sent_messages); + pqueue_free(d1->buffered_app_data.q); free(d1); ssl3_free(s); return (0); -- cgit v1.2.3