From 560b2428fbe557c007898c259701db127945dd82 Mon Sep 17 00:00:00 2001 From: Ricardo Mones Date: Fri, 24 May 2013 14:38:28 +0200 Subject: [PATCH] Remove every control char after colon The extraheaderrc format doesn't allow data after the header colon. Other OSes may insert extra characters other than \n, so, remove them all. (cherry picked from commit 6b978617931b7116397c6c625a26dc638154dd28) --- src/compose.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compose.c b/src/compose.c index 77370deea..7b2e6fa0b 100644 --- a/src/compose.c +++ b/src/compose.c @@ -6625,9 +6625,9 @@ void compose_add_extra_header_entries(GtkListStore *model) goto extra_headers_done; } while (fgets(buf, BUFFSIZE, exh) != NULL) { - lastc = strlen(buf) - 1; /* remove trailing \n */ - buf[lastc] = (buf[lastc] == '\n')? '\0': buf[lastc]; - --lastc; + lastc = strlen(buf) - 1; /* remove trailing control chars */ + while (lastc >= 0 && buf[lastc] != ':') + buf[lastc--] = '\0'; if (lastc > 0 && buf[0] != '#' && buf[lastc] == ':') { buf[lastc] = '\0'; /* remove trailing : for comparison */ if (custom_header_is_allowed(buf)) { -- 2.25.1