diff options
| author | Robert Haas <rhaas@postgresql.org> | 2011-06-17 14:28:45 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2011-06-17 14:28:45 -0400 |
| commit | 062780ec35f9db630e784b27a54440017df77531 (patch) | |
| tree | be416a215bf2dec546fe7e10674c8caf771c2ca7 /src/backend/utils/adt/int.c | |
| parent | bf347c60bdd7e05800f0c06d03e2ad87aeaa5e09 (diff) | |
| download | postgresql-062780ec35f9db630e784b27a54440017df77531.tar.gz postgresql-062780ec35f9db630e784b27a54440017df77531.zip | |
Add overflow checks to int4 and int8 versions of generate_series().
The previous code went into an infinite loop after overflow. In fact,
an overflow is not really an error; it just means that the current
value is the last one we need to return. So, just arrange to stop
immediately when overflow is detected.
Back-patch all the way.
Diffstat (limited to 'src/backend/utils/adt/int.c')
| -rw-r--r-- | src/backend/utils/adt/int.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index 019fcaaa36f..a367421f82b 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -1382,6 +1382,10 @@ generate_series_step_int4(PG_FUNCTION_ARGS) /* increment current in preparation for next iteration */ fctx->current += fctx->step; + /* if next-value computation overflows, this is the final result */ + if (SAMESIGN(result, fctx->step) && !SAMESIGN(result, fctx->current)) + fctx->step = 0; + /* do when there is more left to send */ SRF_RETURN_NEXT(funcctx, Int32GetDatum(result)); } |