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

DCIGETTEXT: Do not make copy of localename

This commit is contained in:
Florian Weimer 2017-06-19 14:44:33 +02:00
parent 81b82fb966
commit 37e9dc8146
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2017-06-19 Florian Weimer <fweimer@redhat.com>
* intl/dcigettext.c (DCIGETTEXT): Do not make copy of localename.
It cannot change while __libc_setlocale_lock is acquired.
2017-06-19 Florian Weimer <fweimer@redhat.com> 2017-06-19 Florian Weimer <fweimer@redhat.com>
* elf/rtld.c (audit_list_string): New variable. * elf/rtld.c (audit_list_string): New variable.

2
intl/dcigettext.c
View File

@ -551,7 +551,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
#ifdef HAVE_PER_THREAD_LOCALE #ifdef HAVE_PER_THREAD_LOCALE
# ifndef IN_LIBGLOCALE # ifndef IN_LIBGLOCALE
# ifdef _LIBC # ifdef _LIBC
localename = strdupa (__current_locale_name (category)); localename = __current_locale_name (category);
# else # else
categoryname = category_to_name (category); categoryname = category_to_name (category);
# define CATEGORYNAME_INITIALIZED # define CATEGORYNAME_INITIALIZED