summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2021-01-07 15:37:19 +0000
committerjsing <>2021-01-07 15:37:19 +0000
commitf020ab198f74d42865692869fdee46cb49c7d1c5 (patch)
tree8f6596ae13e4cd505a491ea49fe4927424dbeb43
parenta44b8f51b28515300b7d351485e371c07311a9f4 (diff)
downloadopenbsd-f020ab198f74d42865692869fdee46cb49c7d1c5.tar.gz
openbsd-f020ab198f74d42865692869fdee46cb49c7d1c5.tar.bz2
openbsd-f020ab198f74d42865692869fdee46cb49c7d1c5.zip
Make tls12_record_layer_free() NULL safe.
This is not an issue currently, but avoids future surprises. Noted by tb@
-rw-r--r--src/lib/libssl/tls12_record_layer.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libssl/tls12_record_layer.c b/src/lib/libssl/tls12_record_layer.c
index 32e3fcc813..600b73987e 100644
--- a/src/lib/libssl/tls12_record_layer.c
+++ b/src/lib/libssl/tls12_record_layer.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls12_record_layer.c,v 1.6 2021/01/07 15:32:59 jsing Exp $ */ 1/* $OpenBSD: tls12_record_layer.c,v 1.7 2021/01/07 15:37:19 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -66,7 +66,11 @@ tls12_record_layer_new(void)
66void 66void
67tls12_record_layer_free(struct tls12_record_layer *rl) 67tls12_record_layer_free(struct tls12_record_layer *rl)
68{ 68{
69 if (rl == NULL)
70 return;
71
69 freezero(rl->read_mac_key, rl->read_mac_key_len); 72 freezero(rl->read_mac_key, rl->read_mac_key_len);
73
70 freezero(rl, sizeof(struct tls12_record_layer)); 74 freezero(rl, sizeof(struct tls12_record_layer));
71} 75}
72 76