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

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

Browse Source
This commit is contained in:
Ryan Kurtz
2024-04-17 11:01:21 -04:00
parent 970d3e90b8 393afa858b
commit 2c48f318e3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/GoSlice.java
View File

@@ -25,6 +25,7 @@ import ghidra.app.util.bin.format.golang.rtti.types.GoSliceType;
import ghidra.app.util.bin.format.golang.structmapping.*;
import ghidra.program.model.address.*;
import ghidra.program.model.data.*;
import ghidra.program.model.listing.Instruction;
import ghidra.program.model.mem.Memory;
import ghidra.util.Msg;
import ghidra.util.exception.CancelledException;
@@ -127,6 +128,12 @@ public class GoSlice implements StructureMarkup<GoSlice> {
try {
Memory memory = programContext.getProgram().getMemory();
Address arrayAddr = getArrayAddress();
Instruction arrayInstr =
programContext.getProgram().getListing().getInstructionAt(arrayAddr);
if (arrayInstr != null) {
// if slice array is pointing at an instruction (commonly in switch tables)
return false;
}
return memory.contains(arrayAddr) &&
memory.contains(arrayAddr.addNoWrap(len * elementSize));
}