NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commita133bf7

committed

Fix misplaced right paren bugs in pgstatfuncs.c.

The bug would only show up if the C sockaddr structure containedzero in the first byte for a valid address; otherwise it wouldfail to fail, which is probably why it went unnoticed for so long.Patch submitted by Joel Jacobson after seeing an article by AndreyKarpov in which he reports finding this through static codeanalysis using PVS-Studio. While I was at it I moved a definitionof a local variable referenced in the buggy code to a more localcontext.Backpatch to all supported branches.

1 parenta09e3fd commita133bf7Copy full SHA for a133bf7

File tree

1 file changed

-4

lines changed

src/backend/utils/adt
- pgstatfuncs.c

1 file changed

-4

lines changed

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

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -618,7 +618,6 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)`
`618`	`618`	`boolnulls[14];`
`619`	`619`	`HeapTupletuple;`
`620`	`620`	`PgBackendStatus*beentry;`
`621`		`-SockAddrzero_clientaddr;`
`622`	`621`
`623`	`622`	`MemSet(values,0,sizeof(values));`
`624`	`623`	`MemSet(nulls,0,sizeof(nulls));`
`@@ -659,6 +658,8 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)`
`659`	`658`	`/* Values only available to same user or superuser */`
`660`	`659`	`if (superuser()\|\|beentry->st_userid==GetUserId())`
`661`	`660`	`{`
	`661`	`+SockAddrzero_clientaddr;`
	`662`	`+`
`662`	`663`	`switch (beentry->st_state)`
`663`	`664`	`{`
`664`	`665`	`caseSTATE_IDLE:`
`@@ -710,7 +711,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)`
`710`	`711`	`/* A zeroed client addr means we don't know */`
`711`	`712`	`memset(&zero_clientaddr,0,sizeof(zero_clientaddr));`
`712`	`713`	`if (memcmp(&(beentry->st_clientaddr),&zero_clientaddr,`
`713`		`-sizeof(zero_clientaddr)==0))`
	`714`	`+sizeof(zero_clientaddr))==0)`
`714`	`715`	`{`
`715`	`716`	`nulls[11]= true;`
`716`	`717`	`nulls[12]= true;`
`@@ -974,7 +975,7 @@ pg_stat_get_backend_client_addr(PG_FUNCTION_ARGS)`
`974`	`975`	`/* A zeroed client addr means we don't know */`
`975`	`976`	`memset(&zero_clientaddr,0,sizeof(zero_clientaddr));`
`976`	`977`	`if (memcmp(&(beentry->st_clientaddr),&zero_clientaddr,`
`977`		`-sizeof(zero_clientaddr)==0))`
	`978`	`+sizeof(zero_clientaddr))==0)`
`978`	`979`	`PG_RETURN_NULL();`
`979`	`980`
`980`	`981`	`switch (beentry->st_clientaddr.addr.ss_family)`
`@@ -1021,7 +1022,7 @@ pg_stat_get_backend_client_port(PG_FUNCTION_ARGS)`
`1021`	`1022`	`/* A zeroed client addr means we don't know */`
`1022`	`1023`	`memset(&zero_clientaddr,0,sizeof(zero_clientaddr));`
`1023`	`1024`	`if (memcmp(&(beentry->st_clientaddr),&zero_clientaddr,`
`1024`		`-sizeof(zero_clientaddr)==0))`
	`1025`	`+sizeof(zero_clientaddr))==0)`
`1025`	`1026`	`PG_RETURN_NULL();`
`1026`	`1027`
`1027`	`1028`	`switch (beentry->st_clientaddr.addr.ss_family)`

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!

Commita133bf7

File tree

1 file changed

1 file changed

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

0 commit comments