doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sanitised loaded memory regions

Browse Source
This commit is contained in:
Nav
2022-02-02 22:32:13 +00:00
parent 6441a9dbf0
commit d23277f4ab
1 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp
View File

@@ -194,27 +194,50 @@ void TargetMemoryInspectionPane::postDeactivate() {
void TargetMemoryInspectionPane::sanitiseSettings() {
// Remove any invalid memory regions. It's very unlikely that there will be any, but not impossible.
this->settings.focusedMemoryRegions.erase(
std::remove_if(
this->settings.focusedMemoryRegions.begin(),
this->settings.focusedMemoryRegions.end(),
[this] (const FocusedMemoryRegion& region) {
return !this->targetMemoryDescriptor.addressRange.contains(region.addressRange);
}
),
this->settings.focusedMemoryRegions.end()
);
auto processedFocusedMemoryRegions = std::vector<FocusedMemoryRegion>();
auto processedExcludedMemoryRegions = std::vector<ExcludedMemoryRegion>();
this->settings.excludedMemoryRegions.erase(
std::remove_if(
this->settings.excludedMemoryRegions.begin(),
this->settings.excludedMemoryRegions.end(),
[this] (const ExcludedMemoryRegion& region) {
return !this->targetMemoryDescriptor.addressRange.contains(region.addressRange);
const auto regionIntersects = [
&processedFocusedMemoryRegions,
&processedExcludedMemoryRegions
] (const MemoryRegion& region) {
for (const auto& processedFocusedRegion : processedFocusedMemoryRegions) {
if (processedFocusedRegion.intersectsWith(region)) {
return true;
}
),
this->settings.excludedMemoryRegions.end()
);
}
for (const auto& processedExcludedRegion : processedExcludedMemoryRegions) {
if (processedExcludedRegion.intersectsWith(region)) {
return true;
}
}
return false;
};
for (const auto& focusedRegion : this->settings.focusedMemoryRegions) {
if (!this->targetMemoryDescriptor.addressRange.contains(focusedRegion.addressRange)
|| regionIntersects(focusedRegion)
) {
continue;
}
processedFocusedMemoryRegions.emplace_back(focusedRegion);
}
for (const auto& excludedRegion : this->settings.excludedMemoryRegions) {
if (!this->targetMemoryDescriptor.addressRange.contains(excludedRegion.addressRange)
|| regionIntersects(excludedRegion)
) {
continue;
}
processedExcludedMemoryRegions.emplace_back(excludedRegion);
}
this->settings.focusedMemoryRegions = std::move(processedFocusedMemoryRegions);
this->settings.excludedMemoryRegions = std::move(processedExcludedMemoryRegions);
}
void TargetMemoryInspectionPane::onTargetStateChanged(Targets::TargetState newState) {