More sanity checks for custom headers.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/clamsmtpd.c b/src/clamsmtpd.c
index 6b43058..853e931 100644
--- a/src/clamsmtpd.c
+++ b/src/clamsmtpd.c
@@ -233,7 +233,14 @@ int main(int argc, char* argv[])
             if(strlen(optarg) == 0)
                 g_header = NULL;
             else
+            {
                 g_header = optarg;
+
+                /* Trim off any ending newline chars */
+                t = g_header + strlen(g_header);
+                while(t > g_header && (*(t - 1) == '\r' || *(t - 1) == '\n'))
+                    *(--t) = 0;
+            }
             break;
 
         /* Change our listening port */