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

fixed bug in intel hex importer

Browse source
This commit is contained in:
ghidravore 2019-08-01 13:12:28 -04:00
parent fc3146ba91
commit 6e59716a50
5 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/MemoryBlockUtils.java
View file

@ -295,7 +295,7 @@ public class MemoryBlockUtils {
}
setBlockAttributes(block, comment, source, r, w, x);
adjustFragment(program, block.getStart(), name);
adjustFragment(program, block.getStart(), block.getName());
return block;
}

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/IntelHexMemImage.java
View file

@ -211,7 +211,7 @@ class IntelHexMemImage {
myRangeMap.remove(range);
}
String name = blockName;
String name = blockName == null ? base.getAddressSpace().getName() : blockName;
while (true) {
try {
MemoryBlockUtils.createInitializedBlock(program, isOverlay, name,

5
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MotorolaHexLoader.java
View file

@ -331,11 +331,10 @@ public class MotorolaHexLoader extends AbstractProgramLoader {
byte[] data = new byte[offset];
System.arraycopy(dataBuffer, 0, data, 0, offset);
String name = baseAddr.getAddressSpace().getName();
Address start = baseAddr.add(startAddress);
name = blockName;
String name =
blockName == null ? baseAddr.getAddressSpace().getName() : blockName;
int count = 0;
while (true) {
try {

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

@ -116,7 +116,11 @@ public class MemoryBlockDB implements MemoryBlock {
@Override
public String getName() {
return record.getString(MemoryMapDBAdapter.NAME_COL);
String name = record.getString(MemoryMapDBAdapter.NAME_COL);
if (name == null) {
name = "";
}
return name;
}
@Override

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

@ -471,7 +471,7 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener {
public MemoryBlock createInitializedBlock(String name, Address start, InputStream is,
long length, TaskMonitor monitor, boolean overlay) throws MemoryConflictException,
AddressOverflowException, CancelledException, LockException, DuplicateNameException {
Objects.requireNonNull(name);
lock.acquire();
try {
checkBlockSize(length, true);
@ -513,6 +513,7 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener {
long offset, long length, boolean overlay) throws LockException, DuplicateNameException,
MemoryConflictException, AddressOverflowException {
Objects.requireNonNull(name);
lock.acquire();
try {
checkBlockSize(length, true);
@ -565,6 +566,7 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener {
boolean overlay) throws MemoryConflictException, AddressOverflowException,
LockException, DuplicateNameException {
Objects.requireNonNull(name);
lock.acquire();
try {
checkBlockSize(size, false);
@ -598,6 +600,8 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener {
@Override
public MemoryBlock createBitMappedBlock(String name, Address start, Address overlayAddress,
long length) throws MemoryConflictException, AddressOverflowException, LockException {
Objects.requireNonNull(name);
lock.acquire();
try {
checkBlockSize(length, false);
@ -625,6 +629,8 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener {
@Override
public MemoryBlock createByteMappedBlock(String name, Address start, Address overlayAddress,
long length) throws MemoryConflictException, AddressOverflowException, LockException {
Objects.requireNonNull(name);
lock.acquire();
try {
checkBlockSize(length, false);
@ -653,6 +659,8 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener {
@Override
public MemoryBlock createBlock(MemoryBlock block, String name, Address start, long length)
throws MemoryConflictException, AddressOverflowException, LockException {
Objects.requireNonNull(name);
lock.acquire();
try {
checkBlockSize(length, block.isInitialized());