NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit9bfb1f2

committed

Minor code review for parse_phrase_operator().

Fix its header comment, which described the old behavior of the <N>phrase distance operator; we missed updating that in commit028350f.Also, reset errno before strtol() call, to defend against the possibilitythat it was already ERANGE at entry. (The lack of complaints says thatit generally isn't, but this is at least a latent bug.) Very minorstylistic improvements as well.Victor Drobny noted the obsolete comment, I noted the errno issue.Back-patch to 9.6 where this code was added, just in case the errnoissue is a live bug in some cases.Discussion:https://postgr.es/m/2b5382fdff9b1f79d5eb2c99c4d2cbe2@postgrespro.ru

1 parent4947fce commit9bfb1f2Copy full SHA for 9bfb1f2

File tree

1 file changed

-5

lines changed

src/backend/utils/adt
- tsquery.c

1 file changed

-5

lines changed

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

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ get_modifiers(char buf, int16 weight, bool *prefix)`
`113`	`113`	`* Parse phrase operator. The operator`
`114`	`114`	`* may take the following forms:`
`115`	`115`	`*`
`116`		`- *a <X> b (distance isno greater than X)`
	`116`	`+ *a <N> b (distance isexactly N lexemes)`
`117`	`117`	`*a <-> b (default distance = 1)`
`118`	`118`	`*`
`119`	`119`	`* The buffer should begin with '<' char`
`@@ -129,10 +129,9 @@ parse_phrase_operator(char buf, int16 distance)`
`129`	`129`	`PHRASE_ERR,`
`130`	`130`	`PHRASE_FINISH`
`131`	`131`	`}state=PHRASE_OPEN;`
`132`		`-`
`133`	`132`	`char*ptr=buf;`
`134`	`133`	`char*endptr;`
`135`		`-longl=1;`
	`134`	`+longl=1;/* default distance */`
`136`	`135`
`137`	`136`	`while (*ptr)`
`138`	`137`	`{`
`@@ -151,16 +150,17 @@ parse_phrase_operator(char buf, int16 distance)`
`151`	`150`	`ptr++;`
`152`	`151`	`break;`
`153`	`152`	`}`
`154`		`-elseif (!t_isdigit(ptr))`
	`153`	`+if (!t_isdigit(ptr))`
`155`	`154`	`{`
`156`	`155`	`state=PHRASE_ERR;`
`157`	`156`	`break;`
`158`	`157`	`}`
`159`	`158`
	`159`	`+errno=0;`
`160`	`160`	`l=strtol(ptr,&endptr,10);`
`161`	`161`	`if (ptr==endptr)`
`162`	`162`	`state=PHRASE_ERR;`
`163`		`-elseif (errno==ERANGE\|\|l>MAXENTRYPOS)`
	`163`	`+elseif (errno==ERANGE\|\|l<0\|\|l>MAXENTRYPOS)`
`164`	`164`	`ereport(ERROR,`
`165`	`165`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`166`	`166`	`errmsg("distance in phrase operator should not be greater than %d",`

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!

Commit9bfb1f2

File tree

1 file changed

1 file changed

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

0 commit comments