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

1) Add (void) cast to _none_init() (while I am here)

Browse Source 
2) Fix longstanding segfault in mb/wc code when unknown encoding is specified
in the locale file (mb/wc functions becomes NULL in that case).
This commit is contained in:
ache 2008-01-23 01:57:26 +00:00
parent 66dc6c3da8
commit 76c6a978cc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ __setrunelocale(const char *encoding)
* The "C" and "POSIX" locale are always here.
*/
if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) {
_none_init(&_DefaultRuneLocale);
(void) _none_init(&_DefaultRuneLocale);
return (0);
}
@ -142,8 +142,10 @@ __setrunelocale(const char *encoding)
ret = _BIG5_init(rl);
else if (strcmp(rl->__encoding, "MSKanji") == 0)
ret = _MSKanji_init(rl);
else
else {
(void) _none_init(&_DefaultRuneLocale);
ret = EFTYPE;
}
if (ret == 0) {
if (CachedRuneLocale != NULL) {
/* See euc.c */