From ad7c5f8545cadfd3a1a963beedf89e95cab56995 Mon Sep 17 00:00:00 2001
From: GetAway <get-away@t-online.de>
Date: Sat, 7 Jan 2017 14:50:03 +0100
Subject: [PATCH] catch possible LF's in button text

---
 msgbox.c |  3 ++-
 text.c   | 11 +++++++++++
 text.h   |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/msgbox.c b/msgbox.c
index 1470461..d53a08f 100644
--- a/msgbox.c
+++ b/msgbox.c
@@ -10,7 +10,7 @@
 #include "gfx.h"
 #include "txtform.h" 
 
-#define M_VERSION 1.26
+#define M_VERSION 1.27
 
 #define NCF_FILE 	"/var/tuxbox/config/neutrino.conf"
 #define HDF_FILE	"/tmp/.msgbox_hidden"
@@ -203,6 +203,7 @@ char *pt1=strdup(sptr),*pt2=NULL,*pt3=NULL;
 			char *t = (char *)alloca(l * 4 + 1);
 			memcpy(t, pt2, l + 1);
 			TranslateString(t, l * 4);
+			CatchLF(t);
 			butmsg[btn]=strdup(t);
 			CatchTabs(butmsg[btn++]);
 		}
diff --git a/text.c b/text.c
index ab8df36..8f8a229 100644
--- a/text.c
+++ b/text.c
@@ -354,6 +354,17 @@ int GetStringLen(int _sx, char *string, size_t size)
 	return stringlen;
 }
 
+void CatchLF(char *text)
+{
+char *src, *dst;
+	for (src = dst = text; *src != '\0'; src++)
+	{
+		*dst = *src;
+		if (*dst != 0x0A) dst++;
+	}
+	*dst = '\0';
+}
+
 void CatchTabs(char *text)
 {
 	int i;
diff --git a/text.h b/text.h
index 592f967..d414354 100644
--- a/text.h
+++ b/text.h
@@ -8,5 +8,6 @@ int RenderString(char *string, int sx, int sy, int maxwidth, int layout, int siz
 void TranslateString(char *src, size_t size);
 int GetStringLen(int sx, char *string, size_t size);
 void CatchTabs(char *text);
+void CatchLF(char *text);
 
 #endif
-- 
2.39.5