summaryrefslogtreecommitdiff
path: root/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
authorDoug Hogan <doug@cvs.openbsd.org>2015-07-19 20:32:19 +0000
committerDoug Hogan <doug@cvs.openbsd.org>2015-07-19 20:32:19 +0000
commit5c570d90e439a9cb81512b7d088f4c8c5d61ab52 (patch)
treec9fb34ccd3aba9ce15f19894206336de155a2ac2 /lib/libssl/t1_lib.c
parent00046c4ded0ae8d60f871fb2c05cf76208648133 (diff)
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/t1_lib.c')
-rw-r--r--lib/libssl/t1_lib.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/libssl/t1_lib.c b/lib/libssl/t1_lib.c
index b0f0de3bd8b..70823bf8e71 100644
--- a/lib/libssl/t1_lib.c
+++ b/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.79 2015/07/17 15:50:37 doug Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.80 2015/07/19 20:32:18 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -198,6 +198,9 @@ tls1_new(SSL *s)
void
tls1_free(SSL *s)
{
+ if (s == NULL)
+ return;
+
free(s->tlsext_session_ticket);
ssl3_free(s);
}