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

Fixed whitespace parsing before word.

Browse Source
This commit is contained in:
Vincent Richard 2013-03-24 10:00:30 +01:00
parent 64ae964ae2
commit 005e7af6cd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/word.cpp
View File

@ -125,7 +125,7 @@ ref <word> word::parseNext
if (!unencoded.empty()) if (!unencoded.empty())
{ {
if (prevIsEncoded) if (prevIsEncoded && !isFirst)
unencoded = whiteSpaces + unencoded; unencoded = whiteSpaces + unencoded;
ref <word> w = vmime::create <word>(unencoded, defaultCharset); ref <word> w = vmime::create <word>(unencoded, defaultCharset);
@ -200,11 +200,13 @@ ref <word> word::parseNext
++pos; ++pos;
} }
if (startPos != end && !isFirst && prevIsEncoded)
unencoded += whiteSpaces;
if (startPos != end) if (startPos != end)
{
if (prevIsEncoded && !isFirst)
unencoded = whiteSpaces + unencoded;
unencoded += buffer.substr(startPos, end - startPos); unencoded += buffer.substr(startPos, end - startPos);
}
// Treat unencoded text at the end of the buffer // Treat unencoded text at the end of the buffer
if (!unencoded.empty()) if (!unencoded.empty())