diff options
Diffstat (limited to 'src/backend/utils/adt/varlena.c')
| -rw-r--r-- | src/backend/utils/adt/varlena.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index d9e6bc4338b..7e7d8c73bcf 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -2451,9 +2451,9 @@ SplitIdentifierString(char *rawstring, char separator, * * This is similar to SplitIdentifierString, except that the parsing * rules are meant to handle pathnames instead of identifiers: there is - * no downcasing, the max length is MAXPGPATH-1, and we apply - * canonicalize_path() to each extracted string. Because of the last, - * the returned strings are separately palloc'd rather than being + * no downcasing, embedded spaces are allowed, the max length is MAXPGPATH-1, + * and we apply canonicalize_path() to each extracted string. Because of the + * last, the returned strings are separately palloc'd rather than being * pointers into rawstring --- but we still scribble on rawstring. * * Inputs: @@ -2510,13 +2510,16 @@ SplitDirectoriesString(char *rawstring, char separator, } else { - /* Unquoted name --- extends to separator or whitespace */ - curname = nextp; - while (*nextp && *nextp != separator && - !isspace((unsigned char) *nextp)) + /* Unquoted name --- extends to separator or end of string */ + curname = endp = nextp; + while (*nextp && *nextp != separator) + { + /* trailing whitespace should not be included in name */ + if (!isspace((unsigned char) *nextp)) + endp = nextp + 1; nextp++; - endp = nextp; - if (curname == nextp) + } + if (curname == endp) return false; /* empty unquoted name not allowed */ } |