From: Phil Pennock <pdp@exim.org>
Date: Sun, 20 May 2012 09:33:22 +0000 (-0400)
Subject: GnuTLS debug callback: check for existing \n
X-Git-Tag: exim-4_80_RC3~9
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=8c79eebfd4af6c2f480267b2396bbdf5592919a8;ds=sidebyside

GnuTLS debug callback: check for existing \n
---

diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 05a3e084c..51fdb8657 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -1183,7 +1183,14 @@ return TRUE;
 static void
 exim_gnutls_logger_cb(int level, const char *message)
 {
-  DEBUG(D_tls) debug_printf("GnuTLS<%d>: %s\n", level, message);
+  size_t len = strlen(message);
+  if (len < 1)
+    {
+    DEBUG(D_tls) debug_printf("GnuTLS<%d> empty debug message\n", level);
+    return;
+    }
+  DEBUG(D_tls) debug_printf("GnuTLS<%d>: %s%s", level, message,
+      message[len-1] == '\n' ? "" : "\n");
 }
 #endif