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

fix: Overlays not being applied properly

Browse Source
This commit is contained in:
WerWolv
2023-12-02 18:42:57 +01:00
parent 768982b67a
commit e6ad54b53b
5 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/builtin/source/content/providers/gdb_provider.cpp
View File

@@ -146,8 +146,7 @@ namespace hex::plugin::builtin {
return false;
}
void GDBProvider::read(u64 offset, void *buffer, size_t size, bool overlays) {
void GDBProvider::readRaw(u64 offset, void *buffer, size_t size) {
if ((offset - this->getBaseAddress()) > (this->getActualSize() - size) || buffer == nullptr || size == 0)
return;
@@ -176,40 +175,23 @@ namespace hex::plugin::builtin {
} else {
while (size > 0) {
size_t readSize = std::min(size, CacheLineSize);
this->readRaw(offset, buffer, readSize);
auto data = gdb::readMemory(this->m_socket, offset, size);
if (!data.empty())
std::memcpy(buffer, &data[0], data.size());
size -= readSize;
offset += readSize;
}
}
if (overlays) {
this->applyOverlays(offset, buffer, size);
}
}
void GDBProvider::write(u64 offset, const void *buffer, size_t size) {
if ((offset - this->getBaseAddress()) > (this->getActualSize() - size) || buffer == nullptr || size == 0)
return;
offset -= this->getBaseAddress();
gdb::writeMemory(this->m_socket, offset, buffer, size);
}
void GDBProvider::readRaw(u64 offset, void *buffer, size_t size) {
if ((offset - this->getBaseAddress()) > (this->getActualSize() - size) || buffer == nullptr || size == 0)
return;
auto data = gdb::readMemory(this->m_socket, offset, size);
if (!data.empty())
std::memcpy(buffer, &data[0], data.size());
}
void GDBProvider::writeRaw(u64 offset, const void *buffer, size_t size) {
if ((offset - this->getBaseAddress()) > (this->getActualSize() - size) || buffer == nullptr || size == 0)
return;
offset -= this->getBaseAddress();
gdb::writeMemory(this->m_socket, offset, buffer, size);
}