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

GP-4508 revised address range space checks

Browse source
This commit is contained in:
ghidra1 2024-06-26 09:13:11 -04:00
parent 2b73a6157f
commit 4b30e484b0
4 changed files with 57 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionManagerDB.java
View file

@ -220,10 +220,13 @@ public class FunctionManagerDB implements FunctionManager {
}
}
static void checkSingleAddressSpaceOnly(AddressSetView set) {
if (set.getMinAddress().getAddressSpace() != set.getMaxAddress().getAddressSpace()) {
throw new IllegalArgumentException(
"Function body must contain single address space only");
static void checkSingleAddressSpaceOnly(AddressSetView set) throws IllegalArgumentException {
AddressSpace addressSpace = set.getMinAddress().getAddressSpace();
for (AddressRange range : set.getAddressRanges()) {
if (range.getMinAddress().getAddressSpace() != addressSpace) {
throw new IllegalArgumentException(
"Function body must contain single address space only");
}
}
}

17
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractStoredProgramContext.java
View file

@ -247,9 +247,9 @@ abstract public class AbstractStoredProgramContext extends AbstractProgramContex
@Override
public void remove(Address start, Address end, Register register)
throws ContextChangeException {
if (start.getAddressSpace() != end.getAddressSpace()) {
if (!start.getAddressSpace().equals(end.getAddressSpace())) {
throw new IllegalArgumentException(
"start and end address must refer to the same address space instance");
"start and end address must be within the same address space");
}
RegisterValueStore values = registerValueMap.get(register.getBaseRegister());
if (values != null) {
@ -259,8 +259,9 @@ abstract public class AbstractStoredProgramContext extends AbstractProgramContex
}
// public void removeDefault(Address start, Address end, Register register) {
// if (start.getAddressSpace() != end.getAddressSpace()) {
// throw new IllegalArgumentException("start and end address must refer to the same address space instance");
// if (!start.getAddressSpace().equals(end.getAddressSpace())) {
// throw new IllegalArgumentException(
// "start and end address must be within the same address space");
// }
// invalidateCache();
// RegisterValueStore values = defaultRegisterValueMap.get(register.getBaseRegister());
@ -272,9 +273,9 @@ abstract public class AbstractStoredProgramContext extends AbstractProgramContex
@Override
public void setValue(Register register, Address start, Address end, BigInteger value)
throws ContextChangeException {
if (start.getAddressSpace() != end.getAddressSpace()) {
if (!start.getAddressSpace().equals(end.getAddressSpace())) {
throw new IllegalArgumentException(
"start and end address must refer to the same address space instance");
"start and end address must be within the same address space");
}
if (value == null) {
remove(start, end, register);
@ -285,9 +286,9 @@ abstract public class AbstractStoredProgramContext extends AbstractProgramContex
@Override
public void setDefaultValue(RegisterValue registerValue, Address start, Address end) {
if (start.getAddressSpace() != end.getAddressSpace()) {
if (!start.getAddressSpace().equals(end.getAddressSpace())) {
throw new IllegalArgumentException(
"start and end address must refer to the same address space instance");
"start and end address must be within the same address space");
}
Register baseRegister = registerValue.getRegister().getBaseRegister();
RegisterValueStore store = defaultRegisterValueMap.get(baseRegister);