fix: Infinite loop when doing forwards/backwards searches in some cases

Fixes #1734
WerWolv · Jun 7, 2024 · af59b9d · af59b9d
1 parent 08bb69c
commit af59b9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/external/libwolv b/lib/external/libwolv
diff --git a/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp b/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp
@@ -211,11 +211,21 @@ namespace hex::plugin::builtin {
     }
 
     std::optional<Region> PopupFind::findByteSequence(const std::vector<u8> &sequence) const {
+        if (sequence.empty())
+            return std::nullopt;
+
         auto provider = ImHexApi::Provider::get();
+        if (provider == nullptr)
+            return std::nullopt;
+
+        const auto providerSize = provider->getActualSize();
+        if (providerSize == 0x00)
+            return std::nullopt;
+
         prv::ProviderReader reader(provider);
 
         auto startAbsolutePosition = provider->getBaseAddress();
-        auto endAbsolutePosition = provider->getBaseAddress() + provider->getActualSize() - 1;
+        auto endAbsolutePosition = provider->getBaseAddress() + providerSize - 1;
 
         constexpr static auto searchFunction = [](const auto &haystackBegin, const auto &haystackEnd,
                                                   const auto &needleBegin, const auto &needleEnd) {