NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita6a95d4

committed

Fix thinkos from4f4061b for libpq integer parsing

A check was redundant. While on it, add an assertion to make sure thatthe parsing routine is never called with a NULL input. All the codepaths currently calling the parsing routine are careful with NULL inputsalready, but future callers may forget that.Reported-by: Peter Eisentraut, Lars KanisDiscussion:https://postgr.es/m/ec64956b-4597-56b6-c3db-457d15250fe4@2ndquadrant.comBackpatch-through: 12

1 parent399b8d1 commita6a95d4Copy full SHA for a6a95d4

File tree

1 file changed

-2

lines changed

src/interfaces/libpq
- fe-connect.c

1 file changed

-2

lines changed

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

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1663,6 +1663,8 @@ parse_int_param(const char value, int result, PGconn *conn,`
`1663`	`1663`	`char*end;`
`1664`	`1664`	`longnumval;`
`1665`	`1665`
	`1666`	`+Assert(value!=NULL);`
	`1667`	`+`
`1666`	`1668`	`*result=0;`
`1667`	`1669`
`1668`	`1670`	`/* strtol(3) skips leading whitespaces */`
`@@ -1680,10 +1682,10 @@ parse_int_param(const char value, int result, PGconn *conn,`
`1680`	`1682`	`* Skip any trailing whitespace; if anything but whitespace remains before`
`1681`	`1683`	`* the terminating character, fail`
`1682`	`1684`	`*/`
`1683`		`-while (end&&end!='\0'&&isspace((unsignedchar)*end))`
	`1685`	`+while (end!='\0'&&isspace((unsignedchar)end))`
`1684`	`1686`	`end++;`
`1685`	`1687`
`1686`		`-if (end&&end!='\0')`
	`1688`	`+if (*end!='\0')`
`1687`	`1689`	`gotoerror;`
`1688`	`1690`
`1689`	`1691`	`*result=numval;`

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!

Commita6a95d4

File tree

1 file changed

1 file changed

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

0 commit comments