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

GT-3223_emteere code review changes

Browse source
This commit is contained in:
emteere 2019-10-09 16:11:35 -04:00
parent 9c3ae59860
commit 136c41c027
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/mem/MemoryManagerTest.java
View file

@ -366,8 +366,13 @@ public class MemoryManagerTest extends AbstractGhidraHeadedIntegrationTest {
block = mem.getBlock("NoExist"); block = mem.getBlock("NoExist");
assertNull(block); assertNull(block);
program.endTransaction(transactionID, true);
transactionID = program.startTransaction("Test");
// now exists // now exists
mem.getBlock("Test1").setName("NoExist"); mem.getBlock("Test1").setName("NoExist");
// Test1 no longer exists
assertNull("block deleted", mem.getBlock("Test1"));
block = mem.getBlock("NoExist"); block = mem.getBlock("NoExist");
assertEquals("NoExist", block.getName()); assertEquals("NoExist", block.getName());
@ -375,11 +380,22 @@ public class MemoryManagerTest extends AbstractGhidraHeadedIntegrationTest {
block = mem.getBlock("NoExist"); block = mem.getBlock("NoExist");
assertNull("block should be deleted", block); assertNull("block should be deleted", block);
// Test1 still doesn't exist
block = mem.getBlock("Test1"); block = mem.getBlock("Test1");
assertNull("block deleted", block); assertNull("block deleted", block);
block = mem.getBlock("Test2"); block = mem.getBlock("Test2");
assertEquals("Test2", block.getName()); assertEquals("Test2", block.getName());
program.endTransaction(transactionID, true);
program.undo();
// Test1 still doesn't exist
block = mem.getBlock("Test1");
assertNotNull("Undo, Test1 exists again", block);
transactionID = program.startTransaction("Test");
} }
@Test @Test

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

@ -309,10 +309,13 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener {
public synchronized MemoryBlock getBlock(String blockName) { public synchronized MemoryBlock getBlock(String blockName) {
// find block that might have been cached from previous call // find block that might have been cached from previous call
MemoryBlock memoryBlock = nameBlockMap.get(blockName); MemoryBlock memoryBlock = nameBlockMap.get(blockName);
if (memoryBlock != null) {
if (memoryBlock == NoBlock) { if (memoryBlock == NoBlock) {
// found placeholder, have searched and found nothing before // found placeholder, have searched and found nothing before
return null; return null;
} }
return memoryBlock;
}
for (MemoryBlock block : blocks) { for (MemoryBlock block : blocks) {
if (block.getName().equals(blockName)) { if (block.getName().equals(blockName)) {