whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mutex-lock QLocale's update of its globalLocaleData 

For want of this, nothing that used QLocale::system(), inter alia,
could be thread-safe or re-entrant.

Task-number: QTBUG-49473
Change-Id: I3e017aa7d59c4c39828bb5cdc7ff0780ea66bafe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Edward Welbourne 2017-05-04 16:45:22 +02:00
parent a0faf9e236
commit ba19363529
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/corelib/tools/qlocale.cpp
View File

@ -64,6 +64,9 @@
#include "qstringbuilder.h"
#include "private/qnumeric_p.h"
#include <cmath>
#ifndef QT_NO_SYSTEMLOCALE
# include "qmutex.h"
#endif
#ifdef Q_OS_WIN
# include <qt_windows.h>
# include <time.h>
@ -593,8 +596,6 @@ static QLocalePrivate *c_private()
}
#ifndef QT_NO_SYSTEMLOCALE
/******************************************************************************
** Default system locale behavior
*/
@ -683,14 +684,24 @@ void QLocalePrivate::updateSystemPrivate()
if (!res.isNull())
system_data->m_plus = res.toString().at(0).unicode();
}
#endif
#endif // !QT_NO_SYSTEMLOCALE
static const QLocaleData *systemData()
{
#ifndef QT_NO_SYSTEMLOCALE
// copy over the information from the fallback locale and modify
if (!system_data || system_data->m_language_id == 0)
QLocalePrivate::updateSystemPrivate();
/*
Copy over the information from the fallback locale and modify.
This modifies (cross-thread) global state, so take care to only call it in
one thread.
*/
{
static QBasicMutex systemDataMutex;
systemDataMutex.lock();
if (!system_data || system_data->m_language_id == 0)
QLocalePrivate::updateSystemPrivate();
systemDataMutex.unlock();
}
return system_data;
#else