projects / postgresql.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 07bc6fe)
Add overflow checks to int4 and int8 versions of generate_series().
authorRobert Haas <rhaas@postgresql.org>
Fri, 17 Jun 2011 18:28:45 +0000 (14:28 -0400)
committerRobert Haas <rhaas@postgresql.org>
Fri, 17 Jun 2011 18:33:03 +0000 (14:33 -0400)
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.

src/backend/utils/adt/int.c patch | blob | blame | history
src/backend/utils/adt/int8.c patch | blob | blame | history

diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 47a0bd2a801796266dab91331c8aed4687c1c0a2..8bf3751cdc8521c86391498a0dd4b5d461fe8d02 100644 (file)
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -1470,6 +1470,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 5901d407de1e755dc910d0360ad70e42071b543c..876b2d97f1c07b41d4560738deaf0b8fc2923c33 100644 (file)
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -1268,6 +1268,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));
    }
This is the main PostgreSQL git repository.