aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/utils/misc/guc.c4
-rw-r--r--src/test/regress/expected/guc.out5
-rw-r--r--src/test/regress/sql/guc.sql4
3 files changed, 13 insertions, 0 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 427d807ada1..0c9ed0908f6 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5327,6 +5327,10 @@ parse_real(const char *value, double *result)
if (endptr == value || errno == ERANGE)
return false;
+ /* reject NaN (infinities will fail range checks later) */
+ if (isnan(val))
+ return false;
+
/* allow whitespace after number */
while (isspace((unsigned char) *endptr))
endptr++;
diff --git a/src/test/regress/expected/guc.out b/src/test/regress/expected/guc.out
index 4f0065cb7ef..bca2738c0dc 100644
--- a/src/test/regress/expected/guc.out
+++ b/src/test/regress/expected/guc.out
@@ -506,6 +506,11 @@ SELECT '2006-08-13 12:34:56'::timestamptz;
Sun Aug 13 12:34:56 2006 PDT
(1 row)
+-- Test some simple error cases
+SET seq_page_cost TO 'NaN';
+ERROR: parameter "seq_page_cost" requires a numeric value
+SET vacuum_cost_delay TO '10s';
+ERROR: 10000 is outside the valid range for parameter "vacuum_cost_delay" (0 .. 100)
--
-- Test DISCARD TEMP
--
diff --git a/src/test/regress/sql/guc.sql b/src/test/regress/sql/guc.sql
index 3de8a6b55d6..a99cd5f78a0 100644
--- a/src/test/regress/sql/guc.sql
+++ b/src/test/regress/sql/guc.sql
@@ -144,6 +144,10 @@ RESET datestyle;
SHOW datestyle;
SELECT '2006-08-13 12:34:56'::timestamptz;
+-- Test some simple error cases
+SET seq_page_cost TO 'NaN';
+SET vacuum_cost_delay TO '10s';
+
--
-- Test DISCARD TEMP
--