mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-31 23:11:09 +00:00
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:
parent
b4f48b41b4
commit
4944d5d63f
@ -1,5 +1,9 @@
|
||||
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.
|
||||
|
||||
* sysdeps/unix/sysv/linux/i386/sys/io.h (outw): Fix __INLINE ->
|
||||
|
@ -525,9 +525,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
|
||||
/* When this is a SUID binary we must not allow accessing files
|
||||
outside the dedicated directories. */
|
||||
if (ENABLE_SECURE
|
||||
&& (memchr (single_locale, '/',
|
||||
_nl_find_language (single_locale) - single_locale)
|
||||
!= NULL))
|
||||
&& memchr (single_locale, '/', single_locale) != NULL)
|
||||
/* Ingore this entry. */
|
||||
continue;
|
||||
}
|
||||
|
@ -67,7 +67,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
|
||||
|
||||
if (*name == NULL || (*name)[0] == '\0'
|
||||
|| (__builtin_expect (__libc_enable_secure, 0)
|
||||
&& memchr (*name, '/', _nl_find_language (*name) - *name) != NULL))
|
||||
&& memchr (*name, '/', *name) != NULL))
|
||||
*name = (char *) _nl_C_name;
|
||||
|
||||
if (__builtin_expect (strcmp (*name, _nl_C_name), 1) == 0
|
||||
|
Loading…
Reference in New Issue
Block a user