1 files changed, 3 insertions, 2 deletions

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)