yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +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

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

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