yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

changes from review

Browse source
This commit is contained in:
ghidravore 2019-10-23 16:48:08 -04:00
parent c73f0381d0
commit 0f80eefaa4
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/MemoryBlockDB.java
View file

@ -688,23 +688,26 @@ public class MemoryBlockDB implements MemoryBlock {
} }
ByteSourceRangeList getByteSourceRangeList(Address address, long size) { ByteSourceRangeList getByteSourceRangeList(Address address, long size) {
long offset = address.subtract(startAddress); long blockOffset = address.subtract(startAddress);
size = Math.min(size, length - offset); size = Math.min(size, length - blockOffset);
SubMemoryBlock subBlock = getSubBlock(offset); SubMemoryBlock subBlock = getSubBlock(blockOffset);
long subSize = Math.min(size, subBlock.subBlockLength - (offset - subBlock.getStartingOffset())); long subBlockOffset = blockOffset - subBlock.getStartingOffset();
long available = subBlock.subBlockLength - subBlockOffset;
long subSize = Math.min(size, available);
if (subSize == size) { if (subSize == size) {
return subBlock.getByteSourceRangeList(this, address, offset, size); return subBlock.getByteSourceRangeList(this, address, blockOffset, size);
} }
Address start = address; Address start = address;
ByteSourceRangeList set = subBlock.getByteSourceRangeList(this, start, offset, subSize); ByteSourceRangeList set =
subBlock.getByteSourceRangeList(this, start, blockOffset, subSize);
long total = subSize; long total = subSize;
while (total < size) { while (total < size) {
subBlock = getSubBlock(offset + total); subBlock = getSubBlock(blockOffset + total);
subSize = Math.min(size - total, subBlock.subBlockLength); subSize = Math.min(size - total, subBlock.subBlockLength);
start = address.add(total); start = address.add(total);
set.add(subBlock.getByteSourceRangeList(this, start, offset + total, subSize)); set.add(subBlock.getByteSourceRangeList(this, start, blockOffset + total, subSize));
total += subSize; total += subSize;
} }
return set; return set;

3
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/SubMemoryBlock.java
View file

@ -80,7 +80,8 @@ abstract class SubMemoryBlock implements Comparable<SubMemoryBlock> {
* @return true if the offset is valid for this block * @return true if the offset is valid for this block
*/ */
public final boolean contains(long memBlockOffset) { public final boolean contains(long memBlockOffset) {
return memBlockOffset >= subBlockOffset && memBlockOffset < subBlockOffset + subBlockLength; return (memBlockOffset >= subBlockOffset) &&
(memBlockOffset < subBlockOffset + subBlockLength);
} }
/** /**