Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f0a264a

Browse files
committed
Fix failure to copy setlocale() return value.
POSIX permits setlocale() calls to invalidate any previous setlocale() return values, but commit 5f538ad neglected to account for setlocale(LC_CTYPE, NULL) doing so. The effect was to set the LC_CTYPE environment variable to an unintended value. pg_perm_setlocale() sets this variable to assist PL/Perl; without it, Perl would undo PostgreSQL's locale settings. The known-affected configurations are 32-bit, release builds using Visual Studio 2012 or Visual Studio 2013. Visual Studio 2010 is unaffected, as were all buildfarm-attested configurations. In principle, this bug could leave the wrong LC_CTYPE in effect after PL/Perl use, which could in turn facilitate problems like corrupt tsvector datums. No known platform experiences that consequence, because PL/Perl on Windows does not use this environment variable. The bug has been user-visible, as early postmaster failure, on systems with Windows ANSI code page set to CP936 for "Chinese (Simplified, PRC)" and probably on systems using other multibyte code pages. (SetEnvironmentVariable() rejects values containing character data not valid under the Windows ANSI code page.) Back-patch to 9.4, where the faulty commit first appeared. Reported by Didi Hu and 林鹏程. Reviewed by Tom Lane, though this fix strategy was not his first choice.
1 parent 1f2a378 commit f0a264a

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/backend/utils/adt/pg_locale.c

+6
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,12 @@ pg_perm_setlocale(int category, const char *locale)
183183
*/
184184
if (category == LC_CTYPE)
185185
{
186+
static char save_lc_ctype[LC_ENV_BUFSIZE];
187+
188+
/* copy setlocale() return value before callee invokes it again */
189+
strlcpy(save_lc_ctype, result, sizeof(save_lc_ctype));
190+
result = save_lc_ctype;
191+
186192
#ifdef ENABLE_NLS
187193
SetMessageEncoding(pg_bind_textdomain_codeset(textdomain(NULL)));
188194
#else

0 commit comments

Comments
 (0)