AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-10 07:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* locale/findlocale.c (free_mem): Add cast to avoid warning.
This commit is contained in:
Ulrich Drepper 2000-08-27 19:05:19 +00:00
parent 4944d5d63f
commit 6adc15f574
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2000-08-27 Ulrich Drepper <drepper@redhat.com> 2000-08-27 Ulrich Drepper <drepper@redhat.com>
* locale/findlocale.c (free_mem): Add cast to avoid warning.
* intl/dcigettext.c (DCIGETTEXT): Remove _nl_find_language in code * intl/dcigettext.c (DCIGETTEXT): Remove _nl_find_language in code
to determine invalid locale name. to determine invalid locale name.
* locale/findlocale.c (_nl_find_locale): Likewise. * locale/findlocale.c (_nl_find_locale): Likewise.

3
intl/dcigettext.c
View File

@ -524,8 +524,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 && strchr (single_locale, '/') != NULL)
&& memchr (single_locale, '/', single_locale) != NULL)
/* Ingore this entry. */ /* Ingore this entry. */
continue; continue;
} }

4
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, '/', *name) != NULL)) && strchr (*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
@ -257,7 +257,7 @@ free_mem (void)
if (data != NULL && data->usage_count != UNDELETABLE) if (data != NULL && data->usage_count != UNDELETABLE)
_nl_unload_locale (data); _nl_unload_locale (data);
runp = runp->next; runp = runp->next;
free (here->filename); free ((char *) here->filename);
free (here); free (here);
} }
} }