summaryrefslogtreecommitdiffstats
path: root/lib/libssl/d1_both.c
diff options
context:
space:
mode:
authordoug <doug@openbsd.org>2015-07-19 20:32:18 +0000
committerdoug <doug@openbsd.org>2015-07-19 20:32:18 +0000
commitdd39d9dd286e595263e46e2372bd90e9eab27ca5 (patch)
tree83767707059502d55d4e2f4e593a73051c28c503 /lib/libssl/d1_both.c
parentTest octet counting and non transparent framing. (diff)
downloadwireguard-openbsd-dd39d9dd286e595263e46e2372bd90e9eab27ca5.tar.xz
wireguard-openbsd-dd39d9dd286e595263e46e2372bd90e9eab27ca5.zip
Allow *_free() functions in libssl to handle NULL input.
This mimics free()'s behavior which makes error handling simpler. ok bcook@ miod@
Diffstat (limited to 'lib/libssl/d1_both.c')
-rw-r--r--lib/libssl/d1_both.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libssl/d1_both.c b/lib/libssl/d1_both.c
index 5c93af8bd91..b479c61322e 100644
--- a/lib/libssl/d1_both.c
+++ b/lib/libssl/d1_both.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_both.c,v 1.33 2015/07/18 23:00:23 doug Exp $ */
+/* $OpenBSD: d1_both.c,v 1.34 2015/07/19 20:32:18 doug Exp $ */
/*
* DTLS implementation written by Nagendra Modadugu
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -209,6 +209,8 @@ dtls1_hm_fragment_new(unsigned long frag_len, int reassembly)
static void
dtls1_hm_fragment_free(hm_fragment *frag)
{
+ if (frag == NULL)
+ return;
if (frag->msg_header.is_ccs) {
EVP_CIPHER_CTX_free(