Applied patch sent by Vijay Kumar to correct SMTP dot de-stuffing
authorArt Cancro <ajc@citadel.org>
Sat, 7 Dec 2019 06:08:04 +0000 (01:08 -0500)
committerArt Cancro <ajc@citadel.org>
Sat, 7 Dec 2019 06:08:04 +0000 (01:08 -0500)
citadel/msgbase.c

index 39782600951a214175f71ef2ae5dbe27b4dfc18d..8421dfc1133789bfd14e1d4ad07761fd0b62fa21 100644 (file)
@@ -3108,13 +3108,9 @@ StrBuf *CtdlReadMessageBodyBuf(char *terminator, /* token signalling EOT */
                        }
                        
                        /* Unescape SMTP-style input of two dots at the beginning of the line */
-                       if ((dotdot) &&
-                           (StrLength(LineBuf) == 2) && 
-                           (!strcmp(ChrPtr(LineBuf), "..")))
-                       {
+                       if ((dotdot) && (StrLength(LineBuf) > 1) && (ChrPtr(LineBuf)[0] == '.')) {
                                StrBufCutLeft(LineBuf, 1);
                        }
-                       
                        StrBufAppendBuf(Message, LineBuf, 0);
                }