From fafce72c0193f679bb84ba888ee92ac05b82fde7 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sat, 3 Aug 2024 20:09:10 +0200 Subject: [PATCH] fix: Errors causing `#pragma magic` to not work as expected --- .../builtin/include/content/views/view_pattern_editor.hpp | 2 +- plugins/builtin/source/content/views/view_pattern_editor.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/builtin/include/content/views/view_pattern_editor.hpp b/plugins/builtin/include/content/views/view_pattern_editor.hpp index 12686e3f7..0554e4c8f 100644 --- a/plugins/builtin/include/content/views/view_pattern_editor.hpp +++ b/plugins/builtin/include/content/views/view_pattern_editor.hpp @@ -139,7 +139,7 @@ namespace hex::plugin::builtin { } ImGui::NewLine(); - ImGuiExt::TextUnformattedCentered("hex.builtin.view.pattern_editor.accept_pattern.question"_lang); + ImGui::TextUnformatted("hex.builtin.view.pattern_editor.accept_pattern.question"_lang); ImGui::NewLine(); ImGuiExt::ConfirmButtons("hex.ui.common.yes"_lang, "hex.ui.common.no"_lang, diff --git a/plugins/builtin/source/content/views/view_pattern_editor.cpp b/plugins/builtin/source/content/views/view_pattern_editor.cpp index dd8b812c1..7d96a0536 100644 --- a/plugins/builtin/source/content/views/view_pattern_editor.cpp +++ b/plugins/builtin/source/content/views/view_pattern_editor.cpp @@ -1373,7 +1373,7 @@ namespace hex::plugin::builtin { if (end == std::string::npos) return std::nullopt; - value = value.substr(0, end - 1); + value = value.substr(0, end); value = wolv::util::trim(value); return BinaryPattern(value); @@ -1406,6 +1406,9 @@ namespace hex::plugin::builtin { return false; std::vector bytes(pattern->getSize()); + if (bytes.empty()) + return false; + provider->read(*address, bytes.data(), bytes.size()); if (pattern->matches(bytes))