summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/int8.c
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2011-06-17 14:28:45 -0400
committerRobert Haas <rhaas@postgresql.org>2011-06-17 14:32:55 -0400
commitda021016b4903af677daeb5d9b05e1001d57b5e7 (patch)
treeafb296dc7e5b72c91ab97556ab6a3fc9fa79afa0 /src/backend/utils/adt/int8.c
parent1907dca905254c6558c0419af64c8c74fa05333a (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/int8.c')
-rw-r--r--src/backend/utils/adt/int8.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 88bf703df67..e288c1dff65 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -1230,6 +1230,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));
}