summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-11-20 16:20:16 +0100
committerGitHub <noreply@github.com>2018-11-20 16:20:16 +0100
commit02e6bf7f2025cddcbde6432f6b6396198ab313f4 (patch)
treed7c7a206e2f8c891fe4c41da8a3a46d0902bee13 /Python
parentd5d33681c1cd1df7731eb0fb7c0f297bc2f114e6 (diff)
downloadcpython-git-02e6bf7f2025cddcbde6432f6b6396198ab313f4.tar.gz
bpo-28604: Fix localeconv() for different LC_MONETARY (GH-10606)
locale.localeconv() now sets temporarily the LC_CTYPE locale to the LC_MONETARY locale if the two locales are different and monetary strings are non-ASCII. This temporary change affects other threads. Changes: * locale.localeconv() can now set LC_CTYPE to LC_MONETARY to decode monetary fields. * Add LocaleInfo.grouping_buffer: copy localeconv() grouping string since it can be replaced anytime if a different thread calls localeconv(). * _Py_GetLocaleconvNumeric() now requires a "struct lconv *" structure, so locale.localeconv() now longer calls localeconv() twice. Moreover, the function now requires all arguments to be non-NULL. * Rename STATIC_LOCALE_INFO_INIT to LocaleInfo_STATIC_INIT. * Move _Py_GetLocaleconvNumeric() definition from fileutils.h to pycore_fileutils.h. pycore_fileutils.h now includes locale.h. * The _locale module is now built with Py_BUILD_CORE defined.
Diffstat (limited to 'Python')
-rw-r--r--Python/fileutils.c45
-rw-r--r--Python/formatter_unicode.c28
2 files changed, 39 insertions, 34 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c
index c9a8e58dd1..033c2ff71b 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1868,22 +1868,17 @@ error:
int
-_Py_GetLocaleconvNumeric(PyObject **decimal_point, PyObject **thousands_sep,
- const char **grouping)
+_Py_GetLocaleconvNumeric(struct lconv *lc,
+ PyObject **decimal_point, PyObject **thousands_sep)
{
- int res = -1;
-
- struct lconv *lc = localeconv();
+ assert(decimal_point != NULL);
+ assert(thousands_sep != NULL);
int change_locale = 0;
- if (decimal_point != NULL &&
- (strlen(lc->decimal_point) > 1 || ((unsigned char)lc->decimal_point[0]) > 127))
- {
+ if ((strlen(lc->decimal_point) > 1 || ((unsigned char)lc->decimal_point[0]) > 127)) {
change_locale = 1;
}
- if (thousands_sep != NULL &&
- (strlen(lc->thousands_sep) > 1 || ((unsigned char)lc->thousands_sep[0]) > 127))
- {
+ if ((strlen(lc->thousands_sep) > 1 || ((unsigned char)lc->thousands_sep[0]) > 127)) {
change_locale = 1;
}
@@ -1892,7 +1887,8 @@ _Py_GetLocaleconvNumeric(PyObject **decimal_point, PyObject **thousands_sep,
if (change_locale) {
oldloc = setlocale(LC_CTYPE, NULL);
if (!oldloc) {
- PyErr_SetString(PyExc_RuntimeWarning, "faild to get LC_CTYPE locale");
+ PyErr_SetString(PyExc_RuntimeWarning,
+ "failed to get LC_CTYPE locale");
return -1;
}
@@ -1908,7 +1904,7 @@ _Py_GetLocaleconvNumeric(PyObject **decimal_point, PyObject **thousands_sep,
}
if (loc != NULL) {
- /* Only set the locale temporarilty the LC_CTYPE locale
+ /* Only set the locale temporarily the LC_CTYPE locale
if LC_NUMERIC locale is different than LC_CTYPE locale and
decimal_point and/or thousands_sep are non-ASCII or longer than
1 byte */
@@ -1916,26 +1912,21 @@ _Py_GetLocaleconvNumeric(PyObject **decimal_point, PyObject **thousands_sep,
}
}
- if (decimal_point != NULL) {
- *decimal_point = PyUnicode_DecodeLocale(lc->decimal_point, NULL);
- if (*decimal_point == NULL) {
- goto error;
- }
- }
- if (thousands_sep != NULL) {
- *thousands_sep = PyUnicode_DecodeLocale(lc->thousands_sep, NULL);
- if (*thousands_sep == NULL) {
- goto error;
- }
+ int res = -1;
+
+ *decimal_point = PyUnicode_DecodeLocale(lc->decimal_point, NULL);
+ if (*decimal_point == NULL) {
+ goto done;
}
- if (grouping != NULL) {
- *grouping = lc->grouping;
+ *thousands_sep = PyUnicode_DecodeLocale(lc->thousands_sep, NULL);
+ if (*thousands_sep == NULL) {
+ goto done;
}
res = 0;
-error:
+done:
if (loc != NULL) {
setlocale(LC_CTYPE, oldloc);
}
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index ba09cc67be..e12ba49bd2 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -3,6 +3,7 @@
of int.__float__, etc., that take and return unicode objects */
#include "Python.h"
+#include "pycore_fileutils.h"
#include <locale.h>
/* Raises an exception about an unknown presentation type for this
@@ -396,9 +397,10 @@ typedef struct {
PyObject *decimal_point;
PyObject *thousands_sep;
const char *grouping;
+ char *grouping_buffer;
} LocaleInfo;
-#define STATIC_LOCALE_INFO_INIT {0, 0, 0}
+#define LocaleInfo_STATIC_INIT {0, 0, 0, 0}
/* describes the layout for an integer, see the comment in
calc_number_widths() for details */
@@ -705,11 +707,22 @@ get_locale_info(enum LocaleType type, LocaleInfo *locale_info)
{
switch (type) {
case LT_CURRENT_LOCALE: {
- if (_Py_GetLocaleconvNumeric(&locale_info->decimal_point,
- &locale_info->thousands_sep,
- &locale_info->grouping) < 0) {
+ struct lconv *lc = localeconv();
+ if (_Py_GetLocaleconvNumeric(lc,
+ &locale_info->decimal_point,
+ &locale_info->thousands_sep) < 0) {
return -1;
}
+
+ /* localeconv() grouping can become a dangling pointer or point
+ to a different string if another thread calls localeconv() during
+ the string formatting. Copy the string to avoid this risk. */
+ locale_info->grouping_buffer = _PyMem_Strdup(lc->grouping);
+ if (locale_info->grouping_buffer == NULL) {
+ PyErr_NoMemory();
+ return -1;
+ }
+ locale_info->grouping = locale_info->grouping_buffer;
break;
}
case LT_DEFAULT_LOCALE:
@@ -743,6 +756,7 @@ free_locale_info(LocaleInfo *locale_info)
{
Py_XDECREF(locale_info->decimal_point);
Py_XDECREF(locale_info->thousands_sep);
+ PyMem_Free(locale_info->grouping_buffer);
}
/************************************************************************/
@@ -855,7 +869,7 @@ format_long_internal(PyObject *value, const InternalFormatSpec *format,
/* Locale settings, either from the actual locale or
from a hard-code pseudo-locale */
- LocaleInfo locale = STATIC_LOCALE_INFO_INIT;
+ LocaleInfo locale = LocaleInfo_STATIC_INIT;
/* no precision allowed on integers */
if (format->precision != -1) {
@@ -1027,7 +1041,7 @@ format_float_internal(PyObject *value,
/* Locale settings, either from the actual locale or
from a hard-code pseudo-locale */
- LocaleInfo locale = STATIC_LOCALE_INFO_INIT;
+ LocaleInfo locale = LocaleInfo_STATIC_INIT;
if (format->precision > INT_MAX) {
PyErr_SetString(PyExc_ValueError, "precision too big");
@@ -1190,7 +1204,7 @@ format_complex_internal(PyObject *value,
/* Locale settings, either from the actual locale or
from a hard-code pseudo-locale */
- LocaleInfo locale = STATIC_LOCALE_INFO_INIT;
+ LocaleInfo locale = LocaleInfo_STATIC_INIT;
if (format->precision > INT_MAX) {
PyErr_SetString(PyExc_ValueError, "precision too big");