Avoid integer overflow when LIMIT + OFFSET >= 2^63.

This fixes bug #6139 reported by Hitoshi Harada.

diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c
index 48fb32d3843c7e3f5d1e62746e30ec822cdf1af8..c1363b4ecf84e8314ca1e3983af0162903d7296f 100644 (file)
--- a/src/backend/executor/nodeLimit.c
+++ b/src/backend/executor/nodeLimit.c
@@ -125,7 +125,7 @@ ExecLimit(LimitState *node)
                 * the state machine state to record having done so.
                 */
                if (!node->noCount &&
-                   node->position >= node->offset + node->count)
+                   node->position - node->offset >= node->count)
                {
                    node->lstate = LIMIT_WINDOWEND;
                    return NULL;