NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita691a22

committed

Fix memory overrun when querying pg_stat_slru

pg_stat_get_slru() in pgstatfuncs.c would point to one element after theend of the array PgStat_SLRUStats when finishing to scan its entries.This had no direct consequences as no data from the extra memory areawas read, but static analyzers would rightfully complain here. So let'sbe clean.While on it, this adds one regression test in the area reserved forsystem views.Reported-by: Alexander Kozhemyakin, via AddressSanitizerAuthor: Kyotaro HoriguchiDiscussion:https://postgr.es/m/17280-37da556e86032070@postgresql.orgBackpatch-through: 13

1 parentd4e9d69 commita691a22Copy full SHA for a691a22

File tree

3 files changed

+12

-1

lines changed

src
- backend/utils/adt
  - pgstatfuncs.c
- test/regress
  - expected
    - sysviews.out
  - sql
    - sysviews.sql

3 files changed

+12

-1

lines changed

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1744,14 +1744,15 @@ pg_stat_get_slru(PG_FUNCTION_ARGS)`
`1744`	`1744`	`/* for each row */`
`1745`	`1745`	`Datumvalues[PG_STAT_GET_SLRU_COLS];`
`1746`	`1746`	`boolnulls[PG_STAT_GET_SLRU_COLS];`
`1747`		`-PgStat_SLRUStatsstat=stats[i];`
	`1747`	`+PgStat_SLRUStatsstat;`
`1748`	`1748`	`constchar*name;`
`1749`	`1749`
`1750`	`1750`	`name=pgstat_slru_name(i);`
`1751`	`1751`
`1752`	`1752`	`if (!name)`
`1753`	`1753`	`break;`
`1754`	`1754`
	`1755`	`+stat=stats[i];`
`1755`	`1756`	`MemSet(values,0,sizeof(values));`
`1756`	`1757`	`MemSet(nulls,0,sizeof(nulls));`
`1757`	`1758`

`‎src/test/regress/expected/sysviews.out`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,13 @@ select count(*) >= 0 as ok from pg_prepared_xacts;`
`67`	`67`	`t`
`68`	`68`	`(1 row)`
`69`	`69`
	`70`	`+-- There will surely be at least one SLRU cache`
	`71`	`+select count(*) > 0 as ok from pg_stat_slru;`
	`72`	`+ ok`
	`73`	`+----`
	`74`	`+ t`
	`75`	`+(1 row)`
	`76`	`+`
`70`	`77`	`-- We expect no walreceiver running in this test`
`71`	`78`	`select count(*) = 0 as ok from pg_stat_wal_receiver;`
`72`	`79`	`ok`

`‎src/test/regress/sql/sysviews.sql`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ select count(*) = 0 as ok from pg_prepared_statements;`
`32`	`32`	`-- See also prepared_xacts.sql`
`33`	`33`	`selectcount(*)>=0as okfrom pg_prepared_xacts;`
`34`	`34`
	`35`	`+-- There will surely be at least one SLRU cache`
	`36`	`+selectcount(*)>0as okfrom pg_stat_slru;`
	`37`	`+`
`35`	`38`	`-- We expect no walreceiver running in this test`
`36`	`39`	`selectcount(*)=0as okfrom pg_stat_wal_receiver;`
`37`	`40`

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!

Commita691a22

File tree

3 files changed

3 files changed

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

`‎src/test/regress/expected/sysviews.out`

`‎src/test/regress/sql/sysviews.sql`

0 commit comments