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

duplocale: protect use of global locale (bug 23970)

Browse Source 
Protect the global locale from being modified while we compute the size of
the locale category names.  That allows the use of the global locale in a
single thread, while all other threads use the thread safe locale
functions.
This commit is contained in:
Andreas Schwab 2024-03-06 12:59:47 +01:00
parent b6e3898194
commit 513331b788
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
locale/duplocale.c
View File

@ -43,6 +43,11 @@ __duplocale (locale_t dataset)
int cnt; int cnt;
size_t names_len = 0; size_t names_len = 0;
/* If dataset points to _nl_global_locale, we need to prevent other
threads from modifying it. We also modify global data below (the
usage counts). */
__libc_rwlock_wrlock (__libc_setlocale_lock);
/* Calculate the total space we need to store all the names. */ /* Calculate the total space we need to store all the names. */
for (cnt = 0; cnt < __LC_LAST; ++cnt) for (cnt = 0; cnt < __LC_LAST; ++cnt)
if (cnt != LC_ALL && dataset->__names[cnt] != _nl_C_name) if (cnt != LC_ALL && dataset->__names[cnt] != _nl_C_name)
@ -55,9 +60,6 @@ __duplocale (locale_t dataset)
{ {
char *namep = (char *) (result + 1); char *namep = (char *) (result + 1);
/* We modify global data (the usage counts). */
__libc_rwlock_wrlock (__libc_setlocale_lock);
for (cnt = 0; cnt < __LC_LAST; ++cnt) for (cnt = 0; cnt < __LC_LAST; ++cnt)
if (cnt != LC_ALL) if (cnt != LC_ALL)
{ {
@ -78,11 +80,11 @@ __duplocale (locale_t dataset)
result->__ctype_b = dataset->__ctype_b; result->__ctype_b = dataset->__ctype_b;
result->__ctype_tolower = dataset->__ctype_tolower; result->__ctype_tolower = dataset->__ctype_tolower;
result->__ctype_toupper = dataset->__ctype_toupper; result->__ctype_toupper = dataset->__ctype_toupper;
/* It's done. */
__libc_rwlock_unlock (__libc_setlocale_lock);
} }
/* It's done. */
__libc_rwlock_unlock (__libc_setlocale_lock);
return result; return result;
} }
weak_alias (__duplocale, duplocale) weak_alias (__duplocale, duplocale)