database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Add overflow checks to int4 and int8 versions of generate_series().

Browse Source 
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.
This commit is contained in:
Robert Haas
2011-06-17 14:28:45 -04:00
parent ae31b59512
commit 925079063f
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/utils/adt/int.c
View File

@@ -1382,6 +1382,10 @@ generate_series_step_int4(PG_FUNCTION_ARGS)
/* increment current in preparation for next iteration */ /* increment current in preparation for next iteration */
fctx->current += fctx->step; 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 */ /* do when there is more left to send */
SRF_RETURN_NEXT(funcctx, Int32GetDatum(result)); SRF_RETURN_NEXT(funcctx, Int32GetDatum(result));
} }

4
src/backend/utils/adt/int8.c
View File

@@ -1410,6 +1410,10 @@ generate_series_step_int8(PG_FUNCTION_ARGS)
/* increment current in preparation for next iteration */ /* increment current in preparation for next iteration */
fctx->current += fctx->step; 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 */ /* do when there is more left to send */
SRF_RETURN_NEXT(funcctx, Int64GetDatum(result)); SRF_RETURN_NEXT(funcctx, Int64GetDatum(result));
} }