Commitcbfd82a

committed

Protect pg_stat_reset_shared() against NULL input

Per bug #6082, reported by Steve Haslam

1 parent5cd81b8 commitcbfd82aCopy full SHA for cbfd82a

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
`@@ -1116,9 +1116,17 @@ pg_stat_reset(PG_FUNCTION_ARGS)`
`1116`	`1116`	`Datum`
`1117`	`1117`	`pg_stat_reset_shared(PG_FUNCTION_ARGS)`
`1118`	`1118`	`{`
`1119`		`-char*target=text_to_cstring(PG_GETARG_TEXT_PP(0));`
`1120`		`-`
`1121`		`-pgstat_reset_shared_counters(target);`
	`1119`	`+if (PG_ARGISNULL(0))`
	`1120`	`+/*`
	`1121`	`+ * Same error message as in pgstat_reset_shared_counters(),`
	`1122`	`+ * to keep translations the same.`
	`1123`	`+ */`
	`1124`	`+ereport(ERROR,`
	`1125`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`1126`	`+errmsg("unrecognized reset target: \"%s\"","null"),`
	`1127`	`+errhint("Target must be \"bgwriter\".")));`
	`1128`	`+`
	`1129`	`+pgstat_reset_shared_counters(text_to_cstring(PG_GETARG_TEXT_PP(0)));`
`1122`	`1130`
`1123`	`1131`	`PG_RETURN_VOID();`
`1124`	`1132`	`}`

Comments

(0)