qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* intl/dcigettext.c (DCIGETTEXT): Remove _nl_find_language in code
	to determine invalid locale name.
	* locale/findlocale.c (_nl_find_locale): Likewise.
This commit is contained in:
Ulrich Drepper 2000-08-27 18:45:00 +00:00
parent b4f48b41b4
commit 4944d5d63f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2000-08-27 Ulrich Drepper <drepper@redhat.com> 2000-08-27 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (DCIGETTEXT): Remove _nl_find_language in code
to determine invalid locale name.
* locale/findlocale.c (_nl_find_locale): Likewise.
* posix/annexc.c: Correct test for unavailable feature. * posix/annexc.c: Correct test for unavailable feature.
* sysdeps/unix/sysv/linux/i386/sys/io.h (outw): Fix __INLINE -> * sysdeps/unix/sysv/linux/i386/sys/io.h (outw): Fix __INLINE ->

4
intl/dcigettext.c
View File

@ -525,9 +525,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
/* When this is a SUID binary we must not allow accessing files /* When this is a SUID binary we must not allow accessing files
outside the dedicated directories. */ outside the dedicated directories. */
if (ENABLE_SECURE if (ENABLE_SECURE
&& (memchr (single_locale, '/', && memchr (single_locale, '/', single_locale) != NULL)
_nl_find_language (single_locale) - single_locale)
!= NULL))
/* Ingore this entry. */ /* Ingore this entry. */
continue; continue;
} }

2
locale/findlocale.c
View File

@ -67,7 +67,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
if (*name == NULL || (*name)[0] == '\0' if (*name == NULL || (*name)[0] == '\0'
|| (__builtin_expect (__libc_enable_secure, 0) || (__builtin_expect (__libc_enable_secure, 0)
&& memchr (*name, '/', _nl_find_language (*name) - *name) != NULL)) && memchr (*name, '/', *name) != NULL))
*name = (char *) _nl_C_name; *name = (char *) _nl_C_name;
if (__builtin_expect (strcmp (*name, _nl_C_name), 1) == 0 if (__builtin_expect (strcmp (*name, _nl_C_name), 1) == 0