Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 744541. r=bz

Browse Source
This commit is contained in:
Mats Palmgren 2012-04-17 18:53:06 +02:00
parent 60deee8063
commit 4a61ebe780
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xpcom/io/nsNativeCharsetUtils.cpp
View File

@ -564,9 +564,9 @@ nsNativeCharsetConverter::UnicodeToNative(const PRUnichar **input,
if (gUnicodeToNative != INVALID_ICONV_T) {
res = xp_iconv(gUnicodeToNative, (const char **) input, &inLeft, output, &outLeft);
*inputLeft = inLeft / 2;
*outputLeft = outLeft;
if (res != (size_t) -1) {
*inputLeft = inLeft / 2;
*outputLeft = outLeft;
return NS_OK;
}
@ -607,10 +607,10 @@ nsNativeCharsetConverter::UnicodeToNative(const PRUnichar **input,
inLeft -= sizeof(PRUnichar);
}
(*input) += (*inputLeft - inLeft / 2);
*inputLeft = inLeft / 2;
*outputLeft = outLeft;
if (res != (size_t) -1) {
(*input) += (*inputLeft - inLeft/2);
*inputLeft = inLeft/2;
*outputLeft = outLeft;
return NS_OK;
}
@ -621,6 +621,7 @@ nsNativeCharsetConverter::UnicodeToNative(const PRUnichar **input,
#endif
// fallback: truncate and hope for the best
// XXX This is lame and we have to do better.
utf16_to_isolatin1(input, inputLeft, output, outputLeft);
return NS_OK;