From 3ec6e00ece5fc7483f8890306005f97a2c640861 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Wed, 29 Jun 2011 19:35:11 +0200 Subject: [PATCH] Protect pg_stat_reset_shared() against NULL input Per bug #6082, reported by Steve Haslam --- src/backend/utils/adt/pgstatfuncs.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 12dbff4c9a..4d07bdd24b 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -1537,9 +1537,17 @@ pg_stat_reset(PG_FUNCTION_ARGS) Datum pg_stat_reset_shared(PG_FUNCTION_ARGS) { - char *target = text_to_cstring(PG_GETARG_TEXT_PP(0)); - - pgstat_reset_shared_counters(target); + if (PG_ARGISNULL(0)) + /* + * Same error message as in pgstat_reset_shared_counters(), + * to keep translations the same. + */ + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("unrecognized reset target: \"%s\"", "null"), + errhint("Target must be \"bgwriter\"."))); + + pgstat_reset_shared_counters(text_to_cstring(PG_GETARG_TEXT_PP(0))); PG_RETURN_VOID(); } -- 2.40.0