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

Flush stateful data from iconv (thanks to John van der Kamp, Zarafa).

Browse Source
This commit is contained in:
Vincent Richard 2011-03-31 19:13:03 +00:00
parent 674716438a
commit d7c2fb2e58
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/charsetConverter.cpp
View File

@ -119,6 +119,7 @@ void charsetConverter::convert(utility::inputStream& in, utility::outputStream&
size_t inPos = 0; size_t inPos = 0;
bool prevIsInvalid = false; bool prevIsInvalid = false;
bool breakAfterNext = false;
while (true) while (true)
{ {
@ -126,11 +127,12 @@ void charsetConverter::convert(utility::inputStream& in, utility::outputStream&
size_t inLength = static_cast <size_t>(in.read(inBuffer + inPos, sizeof(inBuffer) - inPos) + inPos); size_t inLength = static_cast <size_t>(in.read(inBuffer + inPos, sizeof(inBuffer) - inPos) + inPos);
size_t outLength = sizeof(outBuffer); size_t outLength = sizeof(outBuffer);
const char* inPtr = inBuffer; const char* inPtr = breakAfterNext ? NULL : inBuffer;
size_t *ptrLength = breakAfterNext ? NULL : &inLength;
char* outPtr = outBuffer; char* outPtr = outBuffer;
// Convert input bytes // Convert input bytes
if (iconv(cd, ICONV_HACK(&inPtr), &inLength, if (iconv(cd, ICONV_HACK(&inPtr), ptrLength,
&outPtr, &outLength) == static_cast <size_t>(-1)) &outPtr, &outLength) == static_cast <size_t>(-1))
{ {
// Illegal input sequence or input sequence has no equivalent // Illegal input sequence or input sequence has no equivalent
@ -170,9 +172,12 @@ void charsetConverter::convert(utility::inputStream& in, utility::outputStream&
prevIsInvalid = false; prevIsInvalid = false;
} }
// Check for end of data if (breakAfterNext)
if (in.eof() && inPos == 0)
break; break;
// Check for end of data, loop again to flush stateful data from iconv
if (in.eof() && inPos == 0)
breakAfterNext = true;
} }
} }

10
tests/parser/charsetTest.cpp
View File

@ -100,6 +100,7 @@ VMIME_TEST_SUITE_BEGIN
VMIME_TEST(testFilterValid1) VMIME_TEST(testFilterValid1)
VMIME_TEST(testFilterValid2) VMIME_TEST(testFilterValid2)
VMIME_TEST(testFilterValid3) VMIME_TEST(testFilterValid3)
VMIME_TEST(testEncodingHebrew1255)
// Test invalid input // Test invalid input
VMIME_TEST(testFilterInvalid1) VMIME_TEST(testFilterInvalid1)
@ -227,6 +228,15 @@ VMIME_TEST_SUITE_BEGIN
VASSERT_EQ("1", toHex(expectedOut), toHex(actualOut)); VASSERT_EQ("1", toHex(expectedOut), toHex(actualOut));
} }
void testEncodingHebrew1255()
{
// hewbrew string in windows-1255 charset
const char data[] = "\xe9\xf9\xf7\xf8\xe9\xf9\xf8\xf7\xe9\xe9\xf9";
vmime::word w = vmime::word(data, "windows-1255");
vmime::string encoded = w.generate();
// less than 60% ascii, base64 received
VASSERT_EQ("1", "=?windows-1255?B?6fn3+On5+Pfp6fk=?=", encoded);
}
// Conversion to hexadecimal for easier debugging // Conversion to hexadecimal for easier debugging
static const vmime::string toHex(const vmime::string str) static const vmime::string toHex(const vmime::string str)