Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-12 10:10:53 +01:00
Code Releases Wiki Activity

fix: String search not including string at end of data (#963)

Browse Source 
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)
This commit is contained in:
qux-bbb 2023-03-11 21:39:50 +08:00 committed by GitHub
parent 069221757f
commit e958934a22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/builtin/source/content/views/view_find.cpp
View File

@ -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 });