From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 6 Feb 2022 19:00:26 +0000 (+0000)
Subject: Fix bogus error message copy.  Bug 2857
X-Git-Tag: exim-4.96-RC0~73
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/7ad863f3819407559cd654639c25dcae427c190f?hp=04a3b93f1da94cc128f2e46a22edb7f8f6a8791b

Fix bogus error message copy.  Bug 2857

Broken-by: bb43acbd98
---

diff --git a/src/src/parse.c b/src/src/parse.c
index 5bf97eab9..edbee2646 100644
--- a/src/src/parse.c
+++ b/src/src/parse.c
@@ -1354,15 +1354,16 @@ for (;;)
 
   if (special)
     {
-    uschar *ss = Ustrchr(s+1, ':') + 1;
+    uschar * ss = Ustrchr(s+1, ':') + 1; /* line after the special... */
     if ((options & specopt) == specbit)
       {
       *error = string_sprintf("\"%.*s\" is not permitted", len, s);
       return FF_ERROR;
       }
-    while (*ss && isspace(*ss)) ss++;
-    while (s[len] && s[len] != '\n') len++;
-    *error = string_copyn(ss, s + len - ss);
+    while (*ss && isspace(*ss)) ss++;	/* skip leading whitespace */
+    if ((len = Ustrlen(ss)) > 0)	/* ignore trailing newlines */
+      for (const uschar * t = ss + len - 1; t >= ss && *t == '\n'; t--) len--;
+    *error = string_copyn(ss, len);	/* becomes the error */
     return special;
     }