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

Fixed HexViewerItem pointer invalidation bug

Browse Source
This commit is contained in:
Nav
2023-03-09 20:46:26 +00:00
parent e83ce7de8f
commit d1e7b900de
4 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Insight/CMakeLists.txt
View File

@@ -76,6 +76,7 @@ target_sources(
${CMAKE_CURRENT_SOURCE_DIR}/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ItemGraphicsView.cpp
${CMAKE_CURRENT_SOURCE_DIR}/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ItemGraphicsScene.cpp
${CMAKE_CURRENT_SOURCE_DIR}/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerItem.cpp
${CMAKE_CURRENT_SOURCE_DIR}/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.cpp
${CMAKE_CURRENT_SOURCE_DIR}/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/GroupItem.cpp
${CMAKE_CURRENT_SOURCE_DIR}/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/TopLevelGroupItem.cpp

6
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/GraphicsItem.hpp
View File

@@ -20,6 +20,12 @@ namespace Bloom::Widgets
this->setCacheMode(QGraphicsItem::CacheMode::NoCache);
}
~GraphicsItem() {
if (this->hexViewerItem != nullptr) {
this->hexViewerItem->allocatedGraphicsItem = nullptr;
}
}
void setHexViewerItem(HexViewerItem* item) {
if (this->hexViewerItem != nullptr) {
this->hexViewerItem->allocatedGraphicsItem = nullptr;

25
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerItem.cpp Normal file
View File

@@ -0,0 +1,25 @@
#include "HexViewerItem.hpp"
#include "GraphicsItem.hpp"
namespace Bloom::Widgets
{
HexViewerItem::HexViewerItem(Targets::TargetMemoryAddress startAddress, HexViewerItem* parent)
: startAddress(startAddress)
, parent(parent)
{}
HexViewerItem::~HexViewerItem() {
if (this->allocatedGraphicsItem != nullptr) {
this->allocatedGraphicsItem->setHexViewerItem(nullptr);
}
}
QPoint HexViewerItem::position() const {
if (this->parent != nullptr) {
return this->parent->position() + this->relativePosition;
}
return this->relativePosition;
}
}

18
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerItem.hpp
View File

@@ -25,23 +25,11 @@ namespace Bloom::Widgets
HexViewerItem* parent = nullptr;
GraphicsItem* allocatedGraphicsItem = nullptr;
HexViewerItem(
Targets::TargetMemoryAddress startAddress,
HexViewerItem* parent = nullptr
)
: startAddress(startAddress)
, parent(parent)
{};
HexViewerItem(Targets::TargetMemoryAddress startAddress, HexViewerItem* parent = nullptr);
virtual ~HexViewerItem() = default;
virtual ~HexViewerItem();
QPoint position() const {
if (this->parent != nullptr) {
return this->parent->position() + this->relativePosition;
}
return this->relativePosition;
}
QPoint position() const;
virtual QSize size() const = 0;