yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

GT-3073 fixed bug in put byte when there is more than one sub block in a

Browse source 
memory block
This commit is contained in:
ghidravore 2019-08-12 13:53:28 -04:00
parent e36b22d268
commit 0af34a4197
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -454,7 +454,7 @@ public class MemoryBlockDB implements MemoryBlock {
SubMemoryBlock subBlock = getSubBlock(offset);
memMap.lock.acquire();
try {
subBlock.putByte(offset - subBlock.getStartingOffset(), b);
subBlock.putByte(offset, b);
}
catch (IOException e) {
memMap.dbError(e);

11
Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/mem/MemBlockDBTest.java
View file

@ -631,6 +631,17 @@ public class MemBlockDBTest extends AbstractGenericTest {
assertEquals(-1, block.getByte(addr(0)));
}
@Test
public void testSetBytesInSubBlocks() throws Exception {
FileBytes fileBytes = createFileBytes();
MemoryBlock block1 = createFileBytesBlock(fileBytes, addr(0), 0, 10);
MemoryBlock block2 = createFileBytesBlock(fileBytes, addr(10), 20, 10);
mem.join(block1, block2);
assertEquals(20, mem.getByte(addr(10)));
mem.setByte(addr(10), (byte) 0);
assertEquals(0, mem.getByte(addr(10)));
}
@Test
public void testBitMappedJoin() throws Exception {
FileBytes fileBytes = createFileBytes();