mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 22:32:46 +00:00
bug 153562
crash trashes user directory, requires new profile avoid BOM at iconv() for Solaris platform patch from jk@tools.de a=asa,r=Roland.Mainz@informatik.med.uni-giessen.de,sr=darin
This commit is contained in:
parent
5c754de32d
commit
4100197436
@ -283,6 +283,35 @@ nsNativeCharsetConverter::LazyInit()
|
||||
NS_ASSERTION(gUnicodeToNative != INVALID_ICONV_T, "no ucs-2 to native converter");
|
||||
#endif
|
||||
|
||||
/*
|
||||
* On Solaris 8 (and newer?), the iconv modules converting to UCS-2
|
||||
* prepend a byte order mark unicode character (BOM, u+FEFF) during
|
||||
* the first use of the iconv converter.
|
||||
*
|
||||
* This dummy conversion gets rid of the BOMs and fixes bugid 153562.
|
||||
*/
|
||||
char dummy_input[1] = { ' ' };
|
||||
char dummy_output[4];
|
||||
|
||||
if (gNativeToUnicode != INVALID_ICONV_T) {
|
||||
const char *input = dummy_input;
|
||||
size_t input_left = sizeof(dummy_input);
|
||||
char *output = dummy_output;
|
||||
size_t output_left = sizeof(dummy_output);
|
||||
|
||||
xp_iconv(gNativeToUnicode, &input, &input_left, &output, &output_left);
|
||||
}
|
||||
#if defined(ENABLE_UTF8_FALLBACK_SUPPORT)
|
||||
if (gUTF8ToUnicode != INVALID_ICONV_T) {
|
||||
const char *input = dummy_input;
|
||||
size_t input_left = sizeof(dummy_input);
|
||||
char *output = dummy_output;
|
||||
size_t output_left = sizeof(dummy_output);
|
||||
|
||||
xp_iconv(gUTF8ToUnicode, &input, &input_left, &output, &output_left);
|
||||
}
|
||||
#endif
|
||||
|
||||
gInitialized = PR_TRUE;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user