Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit95cacd1

Browse files
committed
Use a non-locale-dependent definition of isspace() in array_in/array_out.
array_in discards unquoted leading and trailing whitespace in array values,while array_out is careful to quote array elements that contain whitespace.This is problematic when the definition of "whitespace" varies betweenlocales: array_in could drop characters that were meant to be part of thevalue. To avoid that, lock down "whitespace" to mean only the traditionalsix ASCII space characters.This change also works around a bug in OS X and some older BSD systems, inwhich isspace() could return true for character fragments in UTF8 locales.(There may be other places in PG where that bug could cause problems, butthis is the only one complained of so far; see recent report from StevenSchlansker.)Back-patch to 9.0, but not further. Given the lack of previous reportsof trouble, changing this behavior in stable branches seems to offermore risk of breaking applications than reward of avoiding problems.
1 parentc5d6d5b commit95cacd1

File tree

1 file changed

+29
-7
lines changed

1 file changed

+29
-7
lines changed

‎src/backend/utils/adt/arrayfuncs.c

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.165 2010/08/11 19:12:27 heikki Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.166 2010/08/21 16:55:51 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -50,6 +50,7 @@ typedef enum
5050
ARRAY_LEVEL_DELIMITED
5151
}ArrayParseState;
5252

53+
staticboolarray_isspace(charch);
5354
staticintArrayCount(constchar*str,int*dim,chartypdelim);
5455
staticvoidReadArrayStr(char*arrayStr,constchar*origStr,
5556
intnitems,intndim,int*dim,
@@ -192,7 +193,7 @@ array_in(PG_FUNCTION_ARGS)
192193
* Note: we currently allow whitespace between, but not within,
193194
* dimension items.
194195
*/
195-
while (isspace((unsignedchar)*p))
196+
while (array_isspace(*p))
196197
p++;
197198
if (*p!='[')
198199
break;/* no more dimension items */
@@ -265,7 +266,7 @@ array_in(PG_FUNCTION_ARGS)
265266
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
266267
errmsg("missing assignment operator")));
267268
p+=strlen(ASSGN);
268-
while (isspace((unsignedchar)*p))
269+
while (array_isspace(*p))
269270
p++;
270271

271272
/*
@@ -350,6 +351,27 @@ array_in(PG_FUNCTION_ARGS)
350351
PG_RETURN_ARRAYTYPE_P(retval);
351352
}
352353

354+
/*
355+
* array_isspace() --- a non-locale-dependent isspace()
356+
*
357+
* We used to use isspace() for parsing array values, but that has
358+
* undesirable results: an array value might be silently interpreted
359+
* differently depending on the locale setting. Now we just hard-wire
360+
* the traditional ASCII definition of isspace().
361+
*/
362+
staticbool
363+
array_isspace(charch)
364+
{
365+
if (ch==' '||
366+
ch=='\t'||
367+
ch=='\n'||
368+
ch=='\r'||
369+
ch=='\v'||
370+
ch=='\f')
371+
return true;
372+
return false;
373+
}
374+
353375
/*
354376
* ArrayCount
355377
* Determines the dimensions for an array string.
@@ -534,7 +556,7 @@ ArrayCount(const char *str, int *dim, char typdelim)
534556
itemdone= true;
535557
nelems[nest_level-1]++;
536558
}
537-
elseif (!isspace((unsignedchar)*ptr))
559+
elseif (!array_isspace(*ptr))
538560
{
539561
/*
540562
* Other non-space characters must be after a
@@ -563,7 +585,7 @@ ArrayCount(const char *str, int *dim, char typdelim)
563585
/* only whitespace is allowed after the closing brace */
564586
while (*ptr)
565587
{
566-
if (!isspace((unsignedchar)*ptr++))
588+
if (!array_isspace(*ptr++))
567589
ereport(ERROR,
568590
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
569591
errmsg("malformed array literal: \"%s\"",str)));
@@ -756,7 +778,7 @@ ReadArrayStr(char *arrayStr,
756778
indx[ndim-1]++;
757779
srcptr++;
758780
}
759-
elseif (isspace((unsignedchar)*srcptr))
781+
elseif (array_isspace(*srcptr))
760782
{
761783
/*
762784
* If leading space, drop it immediately. Else, copy
@@ -1044,7 +1066,7 @@ array_out(PG_FUNCTION_ARGS)
10441066
overall_length+=1;
10451067
}
10461068
elseif (ch=='{'||ch=='}'||ch==typdelim||
1047-
isspace((unsignedchar)ch))
1069+
array_isspace(ch))
10481070
needquote= true;
10491071
}
10501072
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp