GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Useless mutex does not make nl_langinfo() thread-safe.

Browse Source
This commit is contained in:
Vincent Richard 2018-09-06 20:09:54 +02:00
parent cfd4492915
commit ea0d24809d
1 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/vmime/platforms/posix/posixHandler.cpp
View File

@ -55,9 +55,6 @@
#include <cassert> #include <cassert>
#include <cstdlib> #include <cstdlib>
#if VMIME_HAVE_PTHREAD
# include <pthread.h>
#endif // VMIME_HAVE_PTHREAD
/* /*
#ifdef _POSIX_PRIORITY_SCHEDULING #ifdef _POSIX_PRIORITY_SCHEDULING
@ -66,45 +63,6 @@
*/ */
#if VMIME_HAVE_PTHREAD
namespace {
// This construction ensures mutex will be initialized in compile-time
// and will be available any time in the runtime.
pthread_mutex_t g_mutex = PTHREAD_MUTEX_INITIALIZER;
// Helper lock, to be exception safe all the time.
class PLockHelper {
public:
PLockHelper() {
if (pthread_mutex_lock(&g_mutex) != 0) {
assert(!"unable to lock mutex - thread safety's void");
}
}
~PLockHelper() {
if (pthread_mutex_unlock(&g_mutex) != 0) {
assert(!"unable to unlock mutex - application's dead...");
}
}
private:
// Object cannot be copied
PLockHelper(const PLockHelper&);
const PLockHelper& operator=(const PLockHelper&);
};
} // unnamed namespace
#endif // VMIME_HAVE_PTHREAD
namespace vmime { namespace vmime {
namespace platforms { namespace platforms {
namespace posix { namespace posix {
@ -173,9 +131,16 @@ const vmime::datetime posixHandler::getCurrentLocalTime() const {
const vmime::charset posixHandler::getLocalCharset() const { const vmime::charset posixHandler::getLocalCharset() const {
const PLockHelper lock; // Note: nl_langinfo() might be affected by calls to setlocale()
// in a multithread environment. There is not MT-safe alternative
// to nl_langinfo().
auto codeset = ::nl_langinfo(CODESET);
return vmime::charset(::nl_langinfo(CODESET)); if (codeset) {
return vmime::charset(codeset);
}
return vmime::charset();
} }