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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2023-03-21 09:15:36 -04:00
commit 19c50cab08
4 changed files with 46 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -257,7 +257,7 @@ public class AddressEvaluator {
if (globalSymbols.size() == 1) {
return globalSymbols.get(0).getAddress();
}
return null;
return getValueObject(tok);
}
private static Object getValueObject(String strValue) {
@ -268,10 +268,11 @@ public class AddressEvaluator {
start = 2;
radix = 16;
}
if (strValue.endsWith("UL")) {
strValue = strValue.toLowerCase();
if (strValue.endsWith("ul")) {
strValue = strValue.substring(start, strValue.length() - 2);
}
else if (strValue.endsWith("L") || strValue.endsWith("l") || strValue.endsWith("U")) {
else if (strValue.endsWith("l") || strValue.endsWith("u")) {
strValue = strValue.substring(start, strValue.length() - 1);
}
else {