imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-01 21:17:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Multiple race conditions with pattern sorting

Browse Source
This commit is contained in:
WerWolv
2024-10-22 16:20:08 +02:00
parent 101c7a36fb
commit 3739bcc40c
10 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/builtin/source/content/pl_pragmas.cpp
View File

@@ -9,7 +9,7 @@ namespace hex::plugin::builtin {
void registerPatternLanguagePragmas() {
ContentRegistry::PatternLanguage::addPragma("base_address", [](const pl::PatternLanguage &runtime, const std::string &value) {
ContentRegistry::PatternLanguage::addPragma("base_address", [](pl::PatternLanguage &runtime, const std::string &value) {
auto baseAddress = strtoull(value.c_str(), nullptr, 0);
ImHexApi::Provider::get()->setBaseAddress(baseAddress);
@@ -27,4 +27,4 @@ namespace hex::plugin::builtin {
});
}
}
}

6
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@@ -1343,8 +1343,8 @@ namespace hex::plugin::builtin {
};
TextEditor::ErrorMarkers errorMarkers;
if (!m_callStack->empty()) {
for (const auto &frame : *m_callStack | std::views::reverse) {
if (!(*m_callStack)->empty()) {
for (const auto &frame : **m_callStack | std::views::reverse) {
auto location = frame->getLocation();
std::string message;
if (location.source->source == pl::api::Source::DefaultSource) {
@@ -1806,7 +1806,7 @@ namespace hex::plugin::builtin {
if (!m_lastEvaluationResult) {
*m_lastEvaluationError = runtime.getEvalError();
*m_lastCompileError = runtime.getCompileErrors();
*m_callStack = reinterpret_cast<const std::vector<const pl::core::ast::ASTNode *> &>(runtime.getInternals().evaluator->getCallStack());
*m_callStack = &runtime.getInternals().evaluator->getCallStack();
}
TaskManager::doLater([code] {