diff options
| -rw-r--r-- | mailnews/imap/src/nsImapServerResponseParser.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mailnews/imap/src/nsImapServerResponseParser.cpp b/mailnews/imap/src/nsImapServerResponseParser.cpp index fb51db217..d37231ab9 100644 --- a/mailnews/imap/src/nsImapServerResponseParser.cpp +++ b/mailnews/imap/src/nsImapServerResponseParser.cpp @@ -3143,11 +3143,13 @@ bool nsImapServerResponseParser::msg_fetch_literal(bool chunk, int32_t origin) if (fTotalDownloadSize > 0) fServerConnection.PercentProgressUpdateEvent(0, charsReadSoFar + origin, fTotalDownloadSize); } - if (charsReadSoFar > numberOfCharsInThisChunk) + if (!lastChunk && (charsReadSoFar > numberOfCharsInThisChunk)) { - // This is the last line of a chunk. "Literal" here means actual email data and - // its EOLs, without imap protocol elements and their EOLs. End of line is - // defined by two characters \r\n (i.e., CRLF, 0xd,0xa) specified by RFC822. + // This is the last line of a chunk but not the last chunk of a multi-chunk + // message or the only "chunk" of a smaller non-chunked message. "Literal" here + // means actual email data and its EOLs, without imap protocol elements and their + // EOLs. End of line is defined by two characters \r\n (i.e., CRLF, 0xd,0xa) + // specified by RFC822. // Here is an example the most typical last good line of a chunk: // "1s8AA5i4AAvF4QAG6+sAAD0bAPsAAAAA1OAAC)\r\n", where ")\r\n" are non-literals. // This an example of the last "good" line of a chunk that terminates with \r\n @@ -3217,7 +3219,7 @@ bool nsImapServerResponseParser::msg_fetch_literal(bool chunk, int32_t origin) } else { - // Not the last line of a chunk. + // Not the last line of a chunk or any line when lastChunk. if (!fNextChunkStartsWithNewline) { // Process unmodified fCurrentLine string. @@ -3229,7 +3231,7 @@ bool nsImapServerResponseParser::msg_fetch_literal(bool chunk, int32_t origin) { // Ignore the orphan '\n' on a line by itself. MOZ_ASSERT(strlen(fCurrentLine) == 1 && fCurrentLine[0] == '\n', - "Expect '\n' as only character in this line"); + "Expect '\\n' as only character in this line"); fNextChunkStartsWithNewline = false; } } |