diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2012-11-18 17:15:06 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2012-11-18 17:15:06 -0500 |
| commit | b6e3798f3aa2747db145f25e03a8d34f2e5ec8c8 (patch) | |
| tree | d0cd6b85e9106a4c9c3d02d9addd5ebf135449b6 | |
| parent | d038966ddb918872700f9f21affbc84d6bc2c029 (diff) | |
| download | postgresql-b6e3798f3aa2747db145f25e03a8d34f2e5ec8c8.tar.gz postgresql-b6e3798f3aa2747db145f25e03a8d34f2e5ec8c8.zip | |
Limit values of archive_timeout, post_auth_delay, auth_delay.milliseconds.
The previous definitions of these GUC variables allowed them to range
up to INT_MAX, but in point of fact the underlying code would suffer
overflows or other errors with large values. Reduce the maximum values
to something that won't misbehave. There's no apparent value in working
harder than this, since very large delays aren't sensible for any of
these. (Note: the risk with archive_timeout is that if we're late
checking the state, the timestamp difference it's being compared to
might overflow. So we need some amount of slop; the choice of INT_MAX/2
is arbitrary.)
Per followup investigation of bug #7670. Although this isn't a very
significant fix, might as well back-patch.
| -rw-r--r-- | contrib/auth_delay/auth_delay.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/auth_delay/auth_delay.c b/contrib/auth_delay/auth_delay.c index 4e0d5959d19..3131e827b82 100644 --- a/contrib/auth_delay/auth_delay.c +++ b/contrib/auth_delay/auth_delay.c @@ -59,7 +59,7 @@ _PG_init(void) NULL, &auth_delay_milliseconds, 0, - 0, INT_MAX, + 0, INT_MAX / 1000, PGC_SIGHUP, GUC_UNIT_MS, NULL, diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 54461c830fe..81cf136937c 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -1466,7 +1466,7 @@ static struct config_int ConfigureNamesInt[] = GUC_UNIT_S }, &XLogArchiveTimeout, - 0, 0, INT_MAX, + 0, 0, INT_MAX / 2, NULL, NULL, NULL }, { @@ -1476,7 +1476,7 @@ static struct config_int ConfigureNamesInt[] = GUC_NOT_IN_SAMPLE | GUC_UNIT_S }, &PostAuthDelay, - 0, 0, INT_MAX, + 0, 0, INT_MAX / 1000000, NULL, NULL, NULL }, { |