From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Tue, 2 Aug 2011 07:47:17 +0000 (+0300)
Subject: Avoid integer overflow when LIMIT + OFFSET >= 2^63.
X-Git-Tag: REL8_2_22~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=443a44ba62c3b3089456ddcf72df695d3c77bee3;p=thirdparty%2Fpostgresql.git

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 7557e735b68..2dd472f9bc2 100644
--- a/src/backend/executor/nodeLimit.c
+++ b/src/backend/executor/nodeLimit.c
@@ -120,7 +120,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;