Commit79aa445

committed

Protect pg_stat_reset_shared() against NULL input

Per bug #6082, reported by Steve Haslam

1 parent21f1e15 commit79aa445Copy full SHA for 79aa445

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1537,9 +1537,17 @@ pg_stat_reset(PG_FUNCTION_ARGS)`
`1537`	`1537`	`Datum`
`1538`	`1538`	`pg_stat_reset_shared(PG_FUNCTION_ARGS)`
`1539`	`1539`	`{`
`1540`		`-char*target=text_to_cstring(PG_GETARG_TEXT_PP(0));`
`1541`		`-`
`1542`		`-pgstat_reset_shared_counters(target);`
	`1540`	`+if (PG_ARGISNULL(0))`
	`1541`	`+/*`
	`1542`	`+ * Same error message as in pgstat_reset_shared_counters(),`
	`1543`	`+ * to keep translations the same.`
	`1544`	`+ */`
	`1545`	`+ereport(ERROR,`
	`1546`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`1547`	`+errmsg("unrecognized reset target: \"%s\"","null"),`
	`1548`	`+errhint("Target must be \"bgwriter\".")));`
	`1549`	`+`
	`1550`	`+pgstat_reset_shared_counters(text_to_cstring(PG_GETARG_TEXT_PP(0)));`
`1543`	`1551`
`1544`	`1552`	`PG_RETURN_VOID();`
`1545`	`1553`	`}`

Comments

(0)