From e958934a22d9b5ffaf5c19c66055b7c0b8e1c85a Mon Sep 17 00:00:00 2001
From: qux-bbb <1147635419@qq.com>
Date: Sat, 11 Mar 2023 21:39:50 +0800
Subject: [PATCH] fix: String search not including string at end of data (#963)

Before:

![before](https://user-images.githubusercontent.com/18598419/222937056-fec74305-21a3-4bbf-a439-e8df7031bca9.png)

After:

![after](https://user-images.githubusercontent.com/18598419/222937069-a04cb748-4266-4fbb-8182-727bb8858329.png)
---
 plugins/builtin/source/content/views/view_find.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/builtin/source/content/views/view_find.cpp b/plugins/builtin/source/content/views/view_find.cpp
index c5ada5e14..b2d514b97 100644
--- a/plugins/builtin/source/content/views/view_find.cpp
+++ b/plugins/builtin/source/content/views/view_find.cpp
@@ -253,6 +253,7 @@ namespace hex::plugin::builtin {
 
         size_t countedCharacters = 0;
         u64 startAddress = reader.begin().getAddress();
+        u64 endAddress = reader.end().getAddress();
         for (u8 byte : reader) {
             bool validChar =
                 (settings.m_lowerCaseLetters    && std::islower(byte))  ||
@@ -275,7 +276,7 @@ namespace hex::plugin::builtin {
 
             if (validChar)
                 countedCharacters++;
-            else {
+            if (!validChar || startAddress + countedCharacters == endAddress) {
                 if (countedCharacters >= size_t(settings.minLength)) {
                     if (!(settings.nullTermination && byte != 0x00)) {
                         results.push_back(Occurrence { Region { startAddress, countedCharacters }, decodeType, endian });