NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita3699da

committed

libpq: Improve error message when parsing URI parameters and keywords

The error message showing up when parameters or keywords include toomany whitespaces was "trailing data found", which was confusing becausethere was no hint about what was actually wrong.Issue introduced in430ce18, hence there is no need for abackpatch.Author: Yushi OgiwaraReviewed-by: Fujii Masao, Tom Lane, Bruce MomjianDiscussion:https://postgr.es/m/645bd22a53c4da8a1bc7e1e52d9d3b52@oss.nttdata.com

1 parentb38bac2 commita3699daCopy full SHA for a3699da

File tree

2 files changed

-3

lines changed

src/interfaces/libpq
- fe-connect.c
- t
  - 001_uri.pl

2 files changed

-3

lines changed

`‎src/interfaces/libpq/fe-connect.c`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6825,7 +6825,9 @@ conninfo_uri_decode(const char *str, PQExpBuffer errorMessage)`
`6825`	`6825`	`/* Not at the end of the string yet? Fail. */`
`6826`	`6826`	`if (*q!='\0')`
`6827`	`6827`	`{`
`6828`		`-libpq_append_error(errorMessage,"trailing data found: \"%s\"",str);`
	`6828`	`+libpq_append_error(errorMessage,`
	`6829`	`+"unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead",`
	`6830`	`+str);`
`6829`	`6831`	`free(buf);`
`6830`	`6832`	`returnNULL;`
`6831`	`6833`	`}`

`‎src/interfaces/libpq/t/001_uri.pl`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,13 +96,13 @@`
`96`	`96`	`# Trailing data in parameter.`
`97`	`97`	`q{postgresql://host? user user = uri & port = 12345 12},`
`98`	`98`	`q{},`
`99`		`-q{libpq_uri_regress:trailing data found:" user user "},`
	`99`	`+q{libpq_uri_regress:unexpected spaces found in" user user ", use percent-encoded spaces (%20) instead},`
`100`	`100`	`],`
`101`	`101`	`[`
`102`	`102`	`# Trailing data in value.`
`103`	`103`	`q{postgresql://host? user = uri-user & port = 12345 12},`
`104`	`104`	`q{},`
`105`		`-q{libpq_uri_regress:trailing data found:" 12345 12 "},`
	`105`	`+q{libpq_uri_regress:unexpected spaces found in" 12345 12 ", use percent-encoded spaces (%20) instead},`
`106`	`106`	`],`
`107`	`107`	`[q{postgresql://host?},q{host='host' (inet)},q{}, ],`
`108`	`108`	`[`

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!

Commita3699da

File tree

2 files changed

2 files changed

`‎src/interfaces/libpq/fe-connect.c`

`‎src/interfaces/libpq/t/001_uri.pl`

0 commit comments