gh-573: viewer long regex search fix

FarGroup · Dec 16, 2022 · 6803e4f · 6803e4f
1 parent 2c4902b
commit 6803e4f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+w17 16.12.2022 03:00:34 +0300 - build 6071
+
+1. gh-573: viewer long regex serch fix
+
 --------------------------------------------------------------------------------
 drkns 15.12.2022 19:04:20 +0000 - build 6070
 

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-6070
+6071
diff --git a/far/viewer.cpp b/far/viewer.cpp
@@ -3324,8 +3324,9 @@ void Viewer::Search(int Next,const Manager::Key* FirstChar)
 	}
 	LastSearchDirection = search_direction;
 
-	if (!sd.search_len || static_cast<long long>(sd.search_len) > FileSize)
+	if (!sd.search_len || !FileSize)
 		return;
+	const auto can_found = (SearchRegexp && !SearchHex) || static_cast<long long>(sd.search_len) <= FileSize;
 
 	sd.CurPos = LastSelectPos;
 	{
@@ -3337,7 +3338,7 @@ void Viewer::Search(int Next,const Manager::Key* FirstChar)
 
 		for (;;)
 		{
-			const auto found = std::invoke(searcher, this, &sd);
+			const auto found = can_found ? std::invoke(searcher, this, &sd) : Search_NotFound;
 			if (found == Search_Found)
 				break;