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 branch 'GP-2703_ghidra1_ElfStaticRelRO' into Ghidra_10.2

Browse Source
This commit is contained in:
ghidra1
2022-10-17 18:44:46 -04:00
parent 376f780874 6b9bd6c220
commit 3f3bfecdd4
19 changed files with 210 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Processors/ARM/src/main/java/ghidra/app/util/bin/format/elf/relocation/ARM_ElfRelocationHandler.java
View File

@@ -68,8 +68,8 @@ public class ARM_ElfRelocationHandler extends ElfRelocationHandler {
long addend = relocation.getAddend(); // will be 0 for REL case
ElfSymbol sym = elfRelocationContext.getSymbol(symbolIndex);
String symbolName = sym.getNameAsString();
ElfSymbol sym = elfRelocationContext.getSymbol(symbolIndex); // may be null
String symbolName = elfRelocationContext.getSymbolName(symbolIndex);
boolean isThumb = isThumb(sym);
@@ -701,7 +701,7 @@ public class ARM_ElfRelocationHandler extends ElfRelocationHandler {
}
private boolean isThumb(ElfSymbol symbol) {
if (symbol.isFunction() && (symbol.getValue() % 1) == 1) {
if (symbol != null && symbol.isFunction() && (symbol.getValue() % 1) == 1) {
return true;
}
return false;