NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit57379cd

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 parente3db3f8 commit57379cdCopy full SHA for 57379cd

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
`@@ -1696,6 +1696,8 @@ parse_int_param(const char value, int result, PGconn *conn,`
`1696`	`1696`	`char*end;`
`1697`	`1697`	`longnumval;`
`1698`	`1698`
	`1699`	`+Assert(value!=NULL);`
	`1700`	`+`
`1699`	`1701`	`*result=0;`
`1700`	`1702`
`1701`	`1703`	`/* strtol(3) skips leading whitespaces */`
`@@ -1713,10 +1715,10 @@ parse_int_param(const char value, int result, PGconn *conn,`
`1713`	`1715`	`* Skip any trailing whitespace; if anything but whitespace remains before`
`1714`	`1716`	`* the terminating character, fail`
`1715`	`1717`	`*/`
`1716`		`-while (end&&end!='\0'&&isspace((unsignedchar)*end))`
	`1718`	`+while (end!='\0'&&isspace((unsignedchar)end))`
`1717`	`1719`	`end++;`
`1718`	`1720`
`1719`		`-if (end&&end!='\0')`
	`1721`	`+if (*end!='\0')`
`1720`	`1722`	`gotoerror;`
`1721`	`1723`
`1722`	`1724`	`*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!

Commit57379cd

File tree

1 file changed

1 file changed

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

0 commit comments