Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patterns: Fixed wrong offsets when passing custom types to functions

This commit is contained in:
WerWolv 2021-10-08 21:39:30 +02:00
parent a29e3789d2
commit 2dc1886ee9
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/libimhex/include/hex/pattern_language/pattern_data.hpp
View File

@ -689,10 +689,13 @@ namespace hex::pl {
} }
void setOffset(u64 offset) override { void setOffset(u64 offset) override {
for (auto &entry : this->m_entries) { if (!this->isLocal()) {
entry->setOffset(offset + (entry->getOffset() - this->getOffset())); for (auto &entry : this->m_entries) {
entry->setOffset(offset + (entry->getOffset() - this->getOffset()));
}
} }
PatternData::setOffset(offset); PatternData::setOffset(offset);
} }
@ -956,8 +959,10 @@ namespace hex::pl {
} }
void setOffset(u64 offset) override { void setOffset(u64 offset) override {
for (auto &member : this->m_members) { if (!this->isLocal()) {
member->setOffset(offset + (member->getOffset() - this->getOffset())); for (auto &member: this->m_members) {
member->setOffset(offset + (member->getOffset() - this->getOffset()));
}
} }
PatternData::setOffset(offset); PatternData::setOffset(offset);
@ -1093,8 +1098,10 @@ namespace hex::pl {
} }
void setOffset(u64 offset) override { void setOffset(u64 offset) override {
for (auto &member : this->m_members) { if (!this->isLocal()) {
member->setOffset(offset + (member->getOffset() - this->getOffset())); for (auto &member: this->m_members) {
member->setOffset(offset + (member->getOffset() - this->getOffset()));
}
} }
PatternData::setOffset(offset); PatternData::setOffset(offset);

2
plugins/libimhex/source/pattern_language/evaluator.cpp
View File

@ -39,8 +39,8 @@ namespace hex::pl {
} }
pattern->setVariableName(name); pattern->setVariableName(name);
pattern->setOffset(this->getStack().size());
pattern->setLocal(true); pattern->setLocal(true);
pattern->setOffset(this->getStack().size());
this->getStack().emplace_back(); this->getStack().emplace_back();
variables.push_back(pattern); variables.push_back(pattern);