From c4d22677da5e8b9a9a2a2f27a61bc5dc8ad73029 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sun, 13 Sep 2015 13:44:07 +0000
Subject: Don't leak conninfo - spotted by marko kreen. ok jsing@

---
 src/lib/libtls/tls.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib/libtls/tls.c')

diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index 277970c932..4f89a40be4 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.27 2015/09/12 21:00:38 beck Exp $ */
+/* $OpenBSD: tls.c,v 1.28 2015/09/13 13:44:07 beck Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -380,7 +380,8 @@ tls_handshake(struct tls *ctx)
 {
 	int rv = -1;
 
-	if ((ctx->conninfo = calloc(1, sizeof(*ctx->conninfo))) == NULL)
+	if (ctx->conninfo == NULL &&
+	    (ctx->conninfo = calloc(1, sizeof(*ctx->conninfo))) == NULL)
 		goto out;
 
 	if ((ctx->flags & TLS_CLIENT) != 0)
-- 
cgit v1.2.3-55-g6feb