mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch

Browse Source 
'GP-7284_ryanmkurtz_PR-9646_unusual-thoughts_fix-aout-symbols' into
Ghidra_12.2 (Closes #9646)
This commit is contained in:
Ryan Kurtz
2026-09-17 08:38:03 -04:00
parent ad0f0231d6 0da3f75f66
commit 02ba9f2f04
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/UnixAoutProgramLoader.java
View File

@@ -252,19 +252,20 @@ public class UnixAoutProgramLoader {
for (UnixAoutSymbol symbol : symtab) {
Address address = null;
long blockOffset = 0;
MemoryBlock block = null;
switch (symbol.type) {
case N_TEXT:
address = textBlock != null ? textBlock.getStart().add(symbol.value) : null;
blockOffset = symbol.value - header.getTextAddr();
block = textBlock;
break;
case N_DATA:
address = dataBlock != null ? dataBlock.getStart().add(symbol.value) : null;
blockOffset = symbol.value - header.getDataAddr();
block = dataBlock;
break;
case N_BSS:
address = bssBlock != null ? bssBlock.getStart().add(symbol.value) : null;
blockOffset = symbol.value - header.getBssAddr();
block = bssBlock;
break;
case N_UNDF:
@@ -290,10 +291,14 @@ public class UnixAoutProgramLoader {
break;
}
if (address == null || block == null) {
if (block == null) {
continue;
}
if (address == null) {
address = block.getStart().add(blockOffset);
}
switch (symbol.kind) {
case AUX_FUNC:
try {