diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 869e5ac..fee0b51 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1411,6 +1411,7 @@
       OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
       goto err;
     }
+    xn = NULL;
   }
 
   /* we should setup a certificate to return.... */
@@ -1422,6 +1423,7 @@
   ret = 1;
 
 err:
+  X509_NAME_free(xn);
   sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
   return ret;
 }