diff options
| -rw-r--r-- | src/backend/access/common/reloptions.c | 16 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 6 | ||||
| -rw-r--r-- | src/include/utils/guc.h | 5 |
3 files changed, 20 insertions, 7 deletions
diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 8822535998f..eb662f295f9 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.10 2008/04/17 21:37:28 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.11 2008/07/23 17:29:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -21,6 +21,7 @@ #include "nodes/makefuncs.h" #include "utils/array.h" #include "utils/builtins.h" +#include "utils/guc.h" #include "utils/rel.h" @@ -287,7 +288,7 @@ default_reloptions(Datum reloptions, bool validate, { static const char *const default_keywords[1] = {"fillfactor"}; char *values[1]; - int32 fillfactor; + int fillfactor; StdRdOptions *result; parseRelOptions(reloptions, 1, default_keywords, values, validate); @@ -300,7 +301,16 @@ default_reloptions(Datum reloptions, bool validate, if (values[0] == NULL) return NULL; - fillfactor = pg_atoi(values[0], sizeof(int32), 0); + if (!parse_int(values[0], &fillfactor, 0, NULL)) + { + if (validate) + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("fillfactor must be an integer: \"%s\"", + values[0]))); + return NULL; + } + if (fillfactor < minFillfactor || fillfactor > 100) { if (validate) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 8b072895b1e..874d20c15f1 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.464 2008/07/10 22:08:17 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.465 2008/07/23 17:29:53 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -4115,7 +4115,7 @@ parse_bool(const char *value, bool *result) * If not okay and hintmsg is not NULL, *hintmsg is set to a suitable * HINT message, or NULL if no hint provided. */ -static bool +bool parse_int(const char *value, int *result, int flags, const char **hintmsg) { int64 val; @@ -4322,7 +4322,7 @@ parse_int(const char *value, int *result, int flags, const char **hintmsg) * If the string parses okay, return true, else false. * If okay and result is not NULL, return the value in *result. */ -static bool +bool parse_real(const char *value, double *result) { double val; diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index c6e42ef520e..87c383e1ebd 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -7,7 +7,7 @@ * Copyright (c) 2000-2008, PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. * - * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.97 2008/06/30 22:10:43 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.98 2008/07/23 17:29:53 tgl Exp $ *-------------------------------------------------------------------- */ #ifndef GUC_H @@ -224,6 +224,9 @@ extern void AtEOXact_GUC(bool isCommit, int nestLevel); extern void BeginReportingGUCOptions(void); extern void ParseLongOption(const char *string, char **name, char **value); extern bool parse_bool(const char *value, bool *result); +extern bool parse_int(const char *value, int *result, int flags, + const char **hintmsg); +extern bool parse_real(const char *value, double *result); extern bool set_config_option(const char *name, const char *value, GucContext context, GucSource source, GucAction action, bool changeVal); |