NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc1a0d7d

committed

Fix NULL input behaviour of pg_stat_get_replication_slot().

pg_stat_get_replication_slot() accidentally was marked as non-strict, crashingwhen called with NULL input. As it's already released, introduce an explicitNULL check in 14, fix the catalog in HEAD.Bumps catversion in HEAD.Discussion:https://postgr.es/m/20220326212432.s5n2maw6kugnpyxw@alap3.anarazel.deBackpatch: 14-, where replication slot stats were introduced

1 parent6839aa7 commitc1a0d7dCopy full SHA for c1a0d7d

File tree

3 files changed

+23

-1

lines changed

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

3 files changed

+23

-1

lines changed

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

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2315,14 +2315,23 @@ Datum`
`2315`	`2315`	`pg_stat_get_replication_slot(PG_FUNCTION_ARGS)`
`2316`	`2316`	`{`
`2317`	`2317`	`#definePG_STAT_GET_REPLICATION_SLOT_COLS 10`
`2318`		`-text*slotname_text=PG_GETARG_TEXT_P(0);`
	`2318`	`+text*slotname_text;`
`2319`	`2319`	`NameDataslotname;`
`2320`	`2320`	`TupleDesctupdesc;`
`2321`	`2321`	`Datumvalues[PG_STAT_GET_REPLICATION_SLOT_COLS];`
`2322`	`2322`	`boolnulls[PG_STAT_GET_REPLICATION_SLOT_COLS];`
`2323`	`2323`	`PgStat_StatReplSlotEntry*slotent;`
`2324`	`2324`	`PgStat_StatReplSlotEntryallzero;`
`2325`	`2325`
	`2326`	`+/*`
	`2327`	`+ * Function was accidentally marked as non-strict, can't change that post`
	`2328`	`+ * release.`
	`2329`	`+ */`
	`2330`	`+if (PG_ARGISNULL(0))`
	`2331`	`+PG_RETURN_NULL();`
	`2332`	`+`
	`2333`	`+slotname_text=PG_GETARG_TEXT_P(0);`
	`2334`	`+`
`2326`	`2335`	`/* Initialise values and NULL flags arrays */`
`2327`	`2336`	`MemSet(values,0,sizeof(values));`
`2328`	`2337`	`MemSet(nulls,0,sizeof(nulls));`

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

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -201,4 +201,11 @@ FROM prevstats AS pr;`
`201`	`201`
`202`	`202`	`DROP TABLE trunc_stats_test, trunc_stats_test1, trunc_stats_test2, trunc_stats_test3, trunc_stats_test4;`
`203`	`203`	`DROP TABLE prevstats;`
	`204`	`+-- ensure that stats accessors handle NULL input correctly`
	`205`	`+SELECT pg_stat_get_replication_slot(NULL);`
	`206`	`+ pg_stat_get_replication_slot`
	`207`	`+------------------------------`
	`208`	`+`
	`209`	`+(1 row)`
	`210`	`+`
`204`	`211`	`-- End of Stats Test`

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

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,4 +176,10 @@ FROM prevstats AS pr;`
`176`	`176`
`177`	`177`	`DROPTABLE trunc_stats_test, trunc_stats_test1, trunc_stats_test2, trunc_stats_test3, trunc_stats_test4;`
`178`	`178`	`DROPTABLE prevstats;`
	`179`	`+`
	`180`	`+`
	`181`	`+-- ensure that stats accessors handle NULL input correctly`
	`182`	`+SELECT pg_stat_get_replication_slot(NULL);`
	`183`	`+`
	`184`	`+`
`179`	`185`	`-- End of Stats Test`

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!

Commitc1a0d7d

File tree

3 files changed

3 files changed

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

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

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

0 commit comments