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_3_16~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d52555576887cb408b11589a2c07d5b2d06f892d;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 1755268211e..7e0b98211f4 100644
--- 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;