1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00

Avoid thread-safety problem in ecpglib.

ecpglib attempts to force the LC_NUMERIC locale to "C" while reading
server output, to avoid problems with strtod() and related functions.
Historically it's just issued setlocale() calls to do that, but that
has major problems if we're in a threaded application.  setlocale()
itself is not required by POSIX to be thread-safe (and indeed is not,
on recent OpenBSD).  Moreover, its effects are process-wide, so that
we could cause unexpected results in other threads, or another thread
could change our setting.

On platforms having uselocale(), which is required by POSIX:2008,
we can avoid these problems by using uselocale() instead.  Windows
goes its own way as usual, but we can make it safe by using
_configthreadlocale().  Platforms having neither continue to use the
old code, but that should be pretty much nobody among current systems.

(Subsequent buildfarm results show that recent NetBSD versions still
lack uselocale(), but it's not a big problem because they also do not
support non-"C" settings for LC_NUMERIC.)

Back-patch of commits 8eb4a9312 and ee27584c4.

Michael Meskes and Tom Lane; thanks also to Takayuki Tsunakawa.

Discussion: https://postgr.es/m/31420.1547783697@sss.pgh.pa.us
This commit is contained in:
Tom Lane
2019-01-21 23:18:58 -05:00
parent 4aead13a75
commit eb3e90cad1
7 changed files with 134 additions and 11 deletions

View File

@ -482,22 +482,45 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
if (data_var.type != ECPGt_EORT)
{
struct statement stmt;
char *oldlocale;
/* Make sure we do NOT honor the locale for numeric input */
/* since the database gives the standard decimal point */
oldlocale = ecpg_strdup(setlocale(LC_NUMERIC, NULL), lineno);
setlocale(LC_NUMERIC, "C");
memset(&stmt, 0, sizeof stmt);
stmt.lineno = lineno;
/* Make sure we do NOT honor the locale for numeric input */
/* since the database gives the standard decimal point */
/* (see comments in execute.c) */
#ifdef HAVE_USELOCALE
stmt.clocale = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0);
if (stmt.clocale != (locale_t) 0)
stmt.oldlocale = uselocale(stmt.clocale);
#else
#ifdef HAVE__CONFIGTHREADLOCALE
stmt.oldthreadlocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
#endif
stmt.oldlocale = ecpg_strdup(setlocale(LC_NUMERIC, NULL), lineno);
setlocale(LC_NUMERIC, "C");
#endif
/* desperate try to guess something sensible */
stmt.connection = ecpg_get_connection(NULL);
ecpg_store_result(ECPGresult, index, &stmt, &data_var);
setlocale(LC_NUMERIC, oldlocale);
ecpg_free(oldlocale);
#ifdef HAVE_USELOCALE
if (stmt.oldlocale != (locale_t) 0)
uselocale(stmt.oldlocale);
if (stmt.clocale)
freelocale(stmt.clocale);
#else
if (stmt.oldlocale)
{
setlocale(LC_NUMERIC, stmt.oldlocale);
ecpg_free(stmt.oldlocale);
}
#ifdef HAVE__CONFIGTHREADLOCALE
if (stmt.oldthreadlocale != -1)
_configthreadlocale(stmt.oldthreadlocale);
#endif
#endif
}
else if (data_var.ind_type != ECPGt_NO_INDICATOR && data_var.ind_pointer != NULL)

View File

@ -104,7 +104,12 @@ free_statement(struct statement * stmt)
free_variable(stmt->outlist);
ecpg_free(stmt->command);
ecpg_free(stmt->name);
#ifdef HAVE_USELOCALE
if (stmt->clocale)
freelocale(stmt->clocale);
#else
ecpg_free(stmt->oldlocale);
#endif
ecpg_free(stmt);
}
@ -1779,8 +1784,32 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator,
/*
* Make sure we do NOT honor the locale for numeric input/output since the
* database wants the standard decimal point
* database wants the standard decimal point. If available, use
* uselocale() for this because it's thread-safe. Windows doesn't have
* that, but it usually does have _configthreadlocale().
*/
#ifdef HAVE_USELOCALE
stmt->clocale = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0);
if (stmt->clocale == (locale_t) 0)
{
ecpg_do_epilogue(stmt);
return false;
}
stmt->oldlocale = uselocale(stmt->clocale);
if (stmt->oldlocale == (locale_t) 0)
{
ecpg_do_epilogue(stmt);
return false;
}
#else
#ifdef HAVE__CONFIGTHREADLOCALE
stmt->oldthreadlocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
if (stmt->oldthreadlocale == -1)
{
ecpg_do_epilogue(stmt);
return false;
}
#endif
stmt->oldlocale = ecpg_strdup(setlocale(LC_NUMERIC, NULL), lineno);
if (stmt->oldlocale == NULL)
{
@ -1788,6 +1817,7 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator,
return false;
}
setlocale(LC_NUMERIC, "C");
#endif
#ifdef ENABLE_THREAD_SAFETY
ecpg_pthreads_init();
@ -1990,8 +2020,18 @@ ecpg_do_epilogue(struct statement * stmt)
if (stmt == NULL)
return;
#ifdef HAVE_USELOCALE
if (stmt->oldlocale != (locale_t) 0)
uselocale(stmt->oldlocale);
#else
if (stmt->oldlocale)
{
setlocale(LC_NUMERIC, stmt->oldlocale);
#ifdef HAVE__CONFIGTHREADLOCALE
_configthreadlocale(stmt->oldthreadlocale);
#endif
}
#endif
free_statement(stmt);
}

View File

@ -12,6 +12,9 @@
#ifndef CHAR_BIT
#include <limits.h>
#endif
#ifdef LOCALE_T_IN_XLOCALE
#include <xlocale.h>
#endif
enum COMPAT_MODE
{
@ -60,7 +63,15 @@ struct statement
bool questionmarks;
struct variable *inlist;
struct variable *outlist;
#ifdef HAVE_USELOCALE
locale_t clocale;
locale_t oldlocale;
#else
char *oldlocale;
#ifdef HAVE__CONFIGTHREADLOCALE
int oldthreadlocale;
#endif
#endif
int nparams;
char **paramvalues;
PGresult *results;