diff options
| author | Magnus Hagander <magnus@hagander.net> | 2011-06-29 19:35:11 +0200 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2011-06-29 19:37:05 +0200 |
| commit | 3ec6e00ece5fc7483f8890306005f97a2c640861 (patch) | |
| tree | b8ec381cc8a85f5f8b21f2f0cef8fe849b559a1a /src | |
| parent | ca7e04b0b9943d5c33d2e993ff685d45b5bddbbd (diff) | |
| download | postgresql-3ec6e00ece5fc7483f8890306005f97a2c640861.tar.gz postgresql-3ec6e00ece5fc7483f8890306005f97a2c640861.zip | |
Protect pg_stat_reset_shared() against NULL input
Per bug #6082, reported by Steve Haslam
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/pgstatfuncs.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 12dbff4c9a9..4d07bdd24bd 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(); } |