GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed possible infinite loop (thanks to John van der Kamp, Zarafa).

Browse Source
This commit is contained in:
Vincent Richard 2011-01-21 15:28:06 +00:00
parent 9e4867b641
commit 3cec9612fa
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/word.cpp
View File

@ -386,7 +386,7 @@ void word::generate(utility::outputStream& os, const string::size_type maxLineLe
maxRunLength = std::max(maxRunLength, curRunLength); maxRunLength = std::max(maxRunLength, curRunLength);
if (maxRunLength >= maxLineLength - 3) if (((flags & text::FORCE_NO_ENCODING) == 0) && maxRunLength >= maxLineLength - 3)
{ {
// Generate with encoding forced // Generate with encoding forced
generate(os, maxLineLength, curLinePos, newLinePos, flags | text::FORCE_ENCODING, state); generate(os, maxLineLength, curLinePos, newLinePos, flags | text::FORCE_ENCODING, state);

11
tests/parser/textTest.cpp
View File

@ -52,6 +52,7 @@ VMIME_TEST_SUITE_BEGIN
VMIME_TEST(testWhitespaceMBox) VMIME_TEST(testWhitespaceMBox)
VMIME_TEST(testFoldingAscii) VMIME_TEST(testFoldingAscii)
VMIME_TEST(testForcedNonEncoding)
VMIME_TEST_LIST_END VMIME_TEST_LIST_END
@ -442,5 +443,15 @@ VMIME_TEST_SUITE_BEGIN
" =?us-ascii?Q?9012345678901234567890123456789?=", w.generate(50)); " =?us-ascii?Q?9012345678901234567890123456789?=", w.generate(50));
} }
void testForcedNonEncoding()
{
// Testing long unbreakable and unencodable header
vmime::relay r;
r.parse(" from User (Ee9GMqZQ8t7IQwftfAFHd2KyScCYRrFSJ50tKEoXv2bVCG4HcPU80GGWiFabAvG77FekpGgF1h@[127.0.0.1]) by servername.hostname.com\n\t"
"with esmtp id 1NGTS9-2C0sqG0; Fri, 4 Dec 2009 09:23:49 +0100");
VASSERT_EQ("received.long", "from User\r\n (Ee9GMqZQ8t7IQwftfAFHd2KyScCYRrFSJ50tKEoXv2bVCG4HcPU80GGWiFabAvG77FekpGgF1h@[127.0.0.1])\r\n by servername.hostname.com with esmtp id 1NGTS9-2C0sqG0; Fri, 4 Dec 2009\r\n 09:23:49 +0100", r.generate(78));
}
VMIME_TEST_SUITE_END VMIME_TEST_SUITE_END