Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 06:05:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-1187: Fix for cache reading issue.

Browse Source
This commit is contained in:
Dan
2021-08-05 11:18:04 -04:00
parent 3e63efc670
commit 11322c4982
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/pcode/exec/trace/TraceCachedWriteBytesPcodeExecutorState.java
+7 -2
View File
@@ -131,7 +131,8 @@ public class TraceCachedWriteBytesPcodeExecutorState
public byte[] read(long offset, int size) { public byte[] read(long offset, int size) {
if (source != null) { if (source != null) {
// TODO: Warn or bail when reading UNKNOWN bytes // TODO: Warn or bail when reading UNKNOWN bytes
// NOTE: Not going to worry about gaps here: // NOTE: Read without regard to gaps
// NOTE: Cannot write those gaps, though!!!
RangeSet<UnsignedLong> uninitialized = RangeSet<UnsignedLong> uninitialized =
cache.getUninitialized(offset, offset + size); cache.getUninitialized(offset, offset + size);
if (!uninitialized.isEmpty()) { if (!uninitialized.isEmpty()) {
@@ -141,7 +142,11 @@ public class TraceCachedWriteBytesPcodeExecutorState
long upper = upper(toRead); long upper = upper(toRead);
ByteBuffer buf = ByteBuffer.allocate((int) (upper - lower + 1)); ByteBuffer buf = ByteBuffer.allocate((int) (upper - lower + 1));
source.getBytes(snap, space.getAddress(lower), buf); source.getBytes(snap, space.getAddress(lower), buf);
cache.putData(lower, buf.array()); for (Range<UnsignedLong> rng : uninitialized.asRanges()) {
long l = lower(rng);
long u = upper(rng);
cache.putData(l, buf.array(), (int) (l - lower), (int) (u - l + 1));
}
} }
} }
byte[] data = new byte[size]; byte[] data = new byte[size];