diff options
| author | Robert Haas | 2011-06-17 18:28:45 +0000 |
|---|---|---|
| committer | Robert Haas | 2011-06-17 18:32:44 +0000 |
| commit | f49b2eab23199229a322745b6480692056070301 (patch) | |
| tree | c4f7eb958932f518b6d149c1f6399508a037af2d | |
| parent | 8520174b4e788736a41797320d9d36a4372b56df (diff) | |
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.
| -rw-r--r-- | src/backend/utils/adt/int.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/int8.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index abe3c7eae03..a6e853b47d3 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -1372,6 +1372,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)); } diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 5e8cc030137..9ffc5f11d69 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -1421,6 +1421,10 @@ generate_series_step_int8(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, Int64GetDatum(result)); } |