Tolerate NULL nicknames better

svn:r2567

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 63924c26f6c9d7c25328d92ddaf062131151ed53..17865d7294ee29424c5d06e99a2d0356c79ad559 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -297,7 +297,9 @@ tor_tls_context_new(crypto_pk_env_t *identity,
   char nn2[1024];
   int client_only;
   SSL_CTX **ctx;
-  sprintf(nn2, "%s <identity>", nickname ? nickname : "null");
+  if (!nickname)
+    nickname = "null";
+  sprintf(nn2, "%s <identity>", nickname);
 
   tor_tls_init();