From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 19 Jun 2017 12:44:33 +0000 (+0200)
Subject: DCIGETTEXT: Do not make copy of localename
X-Git-Tag: glibc-2.26~308
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37e9dc814636915afb88d0779e5e897e90e7b8c0;p=thirdparty%2Fglibc.git

DCIGETTEXT: Do not make copy of localename
---

diff --git a/ChangeLog b/ChangeLog
index 5c4815eb431..d4aac40eaba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* elf/rtld.c (audit_list_string): New variable.
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 3843b7cbdfa..d97746cae5e 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -551,7 +551,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 #ifdef HAVE_PER_THREAD_LOCALE
 # ifndef IN_LIBGLOCALE
 #  ifdef _LIBC
-  localename = strdupa (__current_locale_name (category));
+  localename = __current_locale_name (category);
 #  else
   categoryname = category_to_name (category);
 #   define CATEGORYNAME_INITIALIZED