From 071e1623d65e30f32d86b1fe777ef4b53804747c Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 13 May 2015 15:51:05 +1000
Subject: Ensure SCI_POSITIONRELATIVE returns a position clamped into the
 document range sensibly. From Mitchell Foral.

---
 src/Document.cxx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Document.cxx b/src/Document.cxx
index 7d34dace1..c25dc84b9 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -767,24 +767,23 @@ bool Document::NextCharacter(int &pos, int moveDir) const {
 	}
 }
 
-// Return -1  on out-of-bounds
 int SCI_METHOD Document::GetRelativePosition(int positionStart, int characterOffset) const {
 	int pos = positionStart;
 	if (dbcsCodePage) {
 		const int increment = (characterOffset > 0) ? 1 : -1;
 		while (characterOffset != 0) {
 			const int posNext = NextPosition(pos, increment);
-			if (posNext == pos)
+			if (posNext == Length())
+				return posNext;
+			else if (posNext == pos)
 				return INVALID_POSITION;
 			pos = posNext;
 			characterOffset -= increment;
 		}
 	} else {
 		pos = positionStart + characterOffset;
-		if ((pos < 0) || (pos > Length()))
-			return INVALID_POSITION;
 	}
-	return pos;
+	return ClampPositionIntoDocument(pos);
 }
 
 int Document::GetRelativePositionUTF16(int positionStart, int characterOffset) const {
-- 
cgit v1.2.3