mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-07-30 07:18:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-07-20 11:37:53 -04:00
parent 64edf25baf fe841ab92d
commit ae7432b8bf
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/SymbolTableCommand.java
View File

@@ -42,7 +42,7 @@ public class SymbolTableCommand extends LoadCommand {
private long stroff;
private long strsize;
private List<NList> symbols = new ArrayList<NList>();
private List<NList> symbols = new ArrayList<>();
/**
* Creates and parses a new {@link SymbolTableCommand}
@@ -144,7 +144,7 @@ public class SymbolTableCommand extends LoadCommand {
(index & DynamicSymbolTableConstants.INDIRECT_SYMBOL_ABS) != 0) {
return null;
}
if (index > symbols.size()) {
if (index >= symbols.size()) {
return null;
}
return symbols.get(index);

3
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
View File

@@ -684,7 +684,8 @@ public class MachoProgramBuilder {
for (int i = indirectSymbolTableIndex; i < indirectSymbolTableIndex + nSymbols; ++i) {
monitor.increment();
int symbolIndex = indirectSymbols.get(i);
NList symbol = symbolTableCommand.getSymbolAt(symbolIndex);
NList symbol =
symbolTableCommand != null ? symbolTableCommand.getSymbolAt(symbolIndex) : null;
String name = null;
if (symbol != null && !symbol.getString().isBlank()) {
name = SymbolUtilities.replaceInvalidChars(symbol.getString(), true);