summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2018-02-08 10:02:48 +0000
committerjsing <>2018-02-08 10:02:48 +0000
commit78c1e4007da03c720853e75d1305085f00fd5e20 (patch)
tree8cc5cea9f13ce4e7b54f3eaedd0b2f6cc918e94e
parent8c6eba876e685911f8c43aeccd30946cfcfec99d (diff)
downloadopenbsd-78c1e4007da03c720853e75d1305085f00fd5e20.tar.gz
openbsd-78c1e4007da03c720853e75d1305085f00fd5e20.tar.bz2
openbsd-78c1e4007da03c720853e75d1305085f00fd5e20.zip
Do not bother NULLing pointers in a struct that is about to be freed.
-rw-r--r--src/lib/libtls/tls_conninfo.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libtls/tls_conninfo.c b/src/lib/libtls/tls_conninfo.c
index e3820988e8..685ed194e4 100644
--- a/src/lib/libtls/tls_conninfo.c
+++ b/src/lib/libtls/tls_conninfo.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_conninfo.c,v 1.16 2017/08/27 01:39:26 beck Exp $ */ 1/* $OpenBSD: tls_conninfo.c,v 1.17 2018/02/08 10:02:48 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2015 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
@@ -276,24 +276,15 @@ tls_conninfo_free(struct tls_conninfo *conninfo)
276 return; 276 return;
277 277
278 free(conninfo->alpn); 278 free(conninfo->alpn);
279 conninfo->alpn = NULL;
280 free(conninfo->cipher); 279 free(conninfo->cipher);
281 conninfo->cipher = NULL;
282 free(conninfo->servername); 280 free(conninfo->servername);
283 conninfo->servername = NULL;
284 free(conninfo->version); 281 free(conninfo->version);
285 conninfo->version = NULL;
286 282
287 free(conninfo->hash); 283 free(conninfo->hash);
288 conninfo->hash = NULL;
289 free(conninfo->issuer); 284 free(conninfo->issuer);
290 conninfo->issuer = NULL;
291 free(conninfo->subject); 285 free(conninfo->subject);
292 conninfo->subject = NULL;
293 286
294 free(conninfo->peer_cert); 287 free(conninfo->peer_cert);
295 conninfo->peer_cert = NULL;
296 conninfo->peer_cert_len = 0;
297 288
298 free(conninfo); 289 free(conninfo);
299} 290}