d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better fix for longstanding segfault. Don't touch current locale at all

Browse Source 
on unknown encoding. Previous fix resets it to POSIX.
This commit is contained in:
Andrey A. Chernov 2008-01-23 02:17:27 +00:00
parent 5776848851
commit 5ebf111155
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/libc/locale/setrunelocale.c
View File

@ -51,6 +51,15 @@ extern _RuneLocale *_Read_RuneMagi(FILE *);
static int __setrunelocale(const char *);
static void convinit(void)
{
__mbrtowc = NULL;
__mbsinit = NULL;
__mbsnrtowcs = __mbsnrtowcs_std;
__wcrtomb = NULL;
__wcsnrtombs = __wcsnrtombs_std;
}
static int
__setrunelocale(const char *encoding)
{
@ -117,35 +126,38 @@ __setrunelocale(const char *encoding)
}
(void)fclose(fp);
__mbrtowc = NULL;
__mbsinit = NULL;
__mbsnrtowcs = __mbsnrtowcs_std;
__wcrtomb = NULL;
__wcsnrtombs = __wcsnrtombs_std;
rl->__sputrune = NULL;
rl->__sgetrune = NULL;
if (strcmp(rl->__encoding, "NONE") == 0)
if (strcmp(rl->__encoding, "NONE") == 0) {
convinit();
ret = _none_init(rl);
else if (strcmp(rl->__encoding, "ASCII") == 0)
} else if (strcmp(rl->__encoding, "ASCII") == 0) {
convinit();
ret = _ascii_init(rl);
else if (strcmp(rl->__encoding, "UTF-8") == 0)
} else if (strcmp(rl->__encoding, "UTF-8") == 0) {
convinit();
ret = _UTF8_init(rl);
else if (strcmp(rl->__encoding, "EUC") == 0)
} else if (strcmp(rl->__encoding, "EUC") == 0) {
convinit();
ret = _EUC_init(rl);
else if (strcmp(rl->__encoding, "GB18030") == 0)
} else if (strcmp(rl->__encoding, "GB18030") == 0) {
convinit();
ret = _GB18030_init(rl);
else if (strcmp(rl->__encoding, "GB2312") == 0)
} else if (strcmp(rl->__encoding, "GB2312") == 0) {
convinit();
ret = _GB2312_init(rl);
else if (strcmp(rl->__encoding, "GBK") == 0)
} else if (strcmp(rl->__encoding, "GBK") == 0) {
convinit();
ret = _GBK_init(rl);
else if (strcmp(rl->__encoding, "BIG5") == 0)
} else if (strcmp(rl->__encoding, "BIG5") == 0) {
convinit();
ret = _BIG5_init(rl);
else if (strcmp(rl->__encoding, "MSKanji") == 0)
} else if (strcmp(rl->__encoding, "MSKanji") == 0) {
convinit();
ret = _MSKanji_init(rl);
else {
(void) _none_init(&_DefaultRuneLocale);
} else
ret = EFTYPE;
}
if (ret == 0) {
if (CachedRuneLocale != NULL) {
/* See euc.c */