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:32:32 -0400 |
| commit | 51328d56a412578480bad0fb65b7cf58816d71b8 (patch) | |
| tree | e2f7dd7e5ddbc42197792055960ff800c2eb9d57 /src/backend/utils/adt | |
| parent | 1c7ddbf3501e989d6b783dc516c44c3535dbe03f (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.
Diffstat (limited to 'src/backend/utils/adt')
| -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 609c3a7fc42..a51f8a9c2c7 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -1381,6 +1381,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 cde9313fdf9..de9b29893ba 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -1412,6 +1412,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)); } |