Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 225125 : open/save dialog crashes mozilla on coming across 'invalid' filenames ; tentative measure (r=smontagu, sr=darin)

Browse Source
This commit is contained in:
jshin%mailaps.org 2004-01-04 08:20:52 +00:00
parent 9ab1afb535
commit 94a487518f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xpcom/io/nsNativeCharsetUtils.cpp
View File

@ -447,11 +447,10 @@ nsNativeCharsetConverter::NativeToUnicode(const char **input,
res = xp_iconv(gNativeToUnicode, input, &inLeft, (char **) output, &outLeft);
if (res != (size_t) -1) {
*inputLeft = inLeft;
*outputLeft = outLeft / 2;
*inputLeft = inLeft;
*outputLeft = outLeft / 2;
if (res != (size_t) -1)
return NS_OK;
}
NS_WARNING("conversion from native to utf-16 failed");
@ -486,12 +485,12 @@ nsNativeCharsetConverter::NativeToUnicode(const char **input,
}
}
if (res != (size_t) -1) {
(*input) += (*inputLeft - inLeft);
*inputLeft = inLeft;
*outputLeft = outLeft / 2;
(*input) += (*inputLeft - inLeft);
*inputLeft = inLeft;
*outputLeft = outLeft / 2;
if (res != (size_t) -1)
return NS_OK;
}
// reset converters
xp_iconv_reset(gNativeToUTF8);
@ -500,6 +499,7 @@ nsNativeCharsetConverter::NativeToUnicode(const char **input,
#endif
// fallback: zero-pad and hope for the best
// XXX This is lame and we have to do better.
isolatin1_to_utf16(input, inputLeft, output, outputLeft);
return NS_OK;