From c24f3f8fbc8b12e1a568c7ca992021fe0148cae9 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Fri, 18 Jun 2010 01:01:56 +0000
Subject: Fix for bug #3017572 FindText crashes with empty text Always return
 start position when search text is empty.

---
 src/Document.cxx    | 2 ++
 test/simpleTests.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/Document.cxx b/src/Document.cxx
index 3c90d1f42..bc3ae0979 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -1151,6 +1151,8 @@ bool Document::MatchesWordOptions(bool word, bool wordStart, int pos, int length
 long Document::FindText(int minPos, int maxPos, const char *search,
                         bool caseSensitive, bool word, bool wordStart, bool regExp, int flags,
                         int *length, CaseFolder *pcf) {
+	if (*length <= 0)
+		return minPos;
 	if (regExp) {
 		if (!regex)
 			regex = CreateRegexSearch(&charClass);
diff --git a/test/simpleTests.py b/test/simpleTests.py
index db414afea..e7e4b3671 100644
--- a/test/simpleTests.py
+++ b/test/simpleTests.py
@@ -748,6 +748,10 @@ class TestSearch(unittest.TestCase):
 		pos = self.ed.FindBytes(0, self.ed.Length, b"big", 0)
 		self.assertEquals(pos, 2)
 
+	def testFindEmpty(self):
+		pos = self.ed.FindBytes(0, self.ed.Length, b"", 0)
+		self.assertEquals(pos, 0)
+
 	def testCaseFind(self):
 		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"big", 0), 2)
 		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"bIg", 0), 2)
-- 
cgit v1.2.3