From ca13432d600593b8eda76721118763b63746eb33 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 23 Nov 2023 00:32:48 +0900 Subject: [PATCH] locale-util: do not call setlocale() when multi-threaded Fixes #30141. --- src/basic/locale-util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c index d43f91fd226..e83c7de8865 100644 --- a/src/basic/locale-util.c +++ b/src/basic/locale-util.c @@ -17,6 +17,7 @@ #include "fileio.h" #include "hashmap.h" #include "locale-util.h" +#include "missing_syscall.h" #include "path-util.h" #include "set.h" #include "string-table.h" @@ -303,6 +304,12 @@ bool is_locale_utf8(void) { } else if (r != -ENXIO) log_debug_errno(r, "Failed to parse $SYSTEMD_UTF8, ignoring: %m"); + /* This function may be called from libsystemd, and setlocale() is not thread safe. Assuming yes. */ + if (gettid() != raw_getpid()) { + cached_answer = true; + goto out; + } + if (!setlocale(LC_ALL, "")) { cached_answer = true; goto out; -- 2.47.3