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

Merge remote-tracking branch 'origin/GP-0_ghidragon_fixing_junit_failures_related_to_AddressEvaluator'

Browse source
This commit is contained in:
Ryan Kurtz 2025-01-03 11:38:31 -05:00
commit 18ef5ceea3
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressEvaluator.java
View file

@ -71,7 +71,7 @@ public class AddressEvaluator extends ExpressionEvaluator {
public static Address evaluate(Program p, Address baseAddr, String inputExpression) {
AddressEvaluator evaluator = new AddressEvaluator(p, true);
try {
return evaluator.parseAsAddress(inputExpression);
return evaluator.parseAsRelativeAddress(inputExpression, baseAddr);
}
catch (ExpressionException e) {
return null;