NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb76e76b

committed

Detect setlocale(LC_CTYPE, NULL) clobbering previous return values.

POSIX permits setlocale() calls to invalidate any previous setlocale()return values. Commit5f538adneglected to account for that. In advance of fixing that bug, switch tofailing hard on affected configurations. This is a planned temporarycommit to assay buildfarm-represented configurations.

1 parent41d798a commitb76e76bCopy full SHA for b76e76b

File tree

1 file changed

+14

-0

lines changed

src/backend/utils/adt
- pg_locale.c

1 file changed

+14

-0

lines changed

`‎src/backend/utils/adt/pg_locale.c`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@`
`58`	`58`	`#include"catalog/pg_collation.h"`
`59`	`59`	`#include"catalog/pg_control.h"`
`60`	`60`	`#include"mb/pg_wchar.h"`
	`61`	`+#include"utils/builtins.h"`
`61`	`62`	`#include"utils/hsearch.h"`
`62`	`63`	`#include"utils/memutils.h"`
`63`	`64`	`#include"utils/pg_locale.h"`
`@@ -148,6 +149,7 @@ pg_perm_setlocale(int category, const char *locale)`
`148`	`149`	`char*result;`
`149`	`150`	`constchar*envvar;`
`150`	`151`	`char*envbuf;`
	`152`	`+charorig_result[LC_ENV_BUFSIZE];`
`151`	`153`
`152`	`154`	`#ifndefWIN32`
`153`	`155`	`result=setlocale(category,locale);`
`@@ -173,6 +175,7 @@ pg_perm_setlocale(int category, const char *locale)`
`173`	`175`
`174`	`176`	`if (result==NULL)`
`175`	`177`	`returnresult;/* fall out immediately on failure */`
	`178`	`+strlcpy(orig_result,result,sizeof(orig_result));`
`176`	`179`
`177`	`180`	`/*`
`178`	`181`	`* Use the right encoding in translated messages. Under ENABLE_NLS, let`
`@@ -231,6 +234,17 @@ pg_perm_setlocale(int category, const char *locale)`
`231`	`234`	`}`
`232`	`235`
`233`	`236`	`snprintf(envbuf,LC_ENV_BUFSIZE-1,"%s=%s",envvar,result);`
	`237`	`+if (strcmp(orig_result,result)!=0)`
	`238`	`+{`
	`239`	`+charhex[2*LC_ENV_BUFSIZE+1];`
	`240`	`+unsignedhexlen;`
	`241`	`+`
	`242`	`+hexlen=`
	`243`	`+hex_encode(result,Min(1+strlen(result),LC_ENV_BUFSIZE),hex);`
	`244`	`+hex[hexlen]='\0';`
	`245`	`+elog(FATAL,"setlocale() result %s clobbered to 0x%s",`
	`246`	`+orig_result,hex);`
	`247`	`+}`
`234`	`248`
`235`	`249`	`if (putenv(envbuf))`
`236`	`250`	`returnNULL;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb76e76b

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/pg_locale.c`

0 commit comments