Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-26 07:23:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-9304_pgalbraith_fix_9303-npe'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-06-24 13:36:35 -04:00
parent c49db1f700 00320b3a62
commit 3b22c3a068
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/ForceUnionAction.java
+8 -1
View File
@@ -69,7 +69,14 @@ public class ForceUnionAction extends AbstractDecompilerAction {
}
Varnode vn = tokenAtCursor.getVarnode();
if (vn != null) {
DataType dt = vn.getHigh().getDataType();
// Some Varnodes -- volatile-memory loads in particular -- never get
// a HighVariable assigned during decompile, so getHigh() can be null.
// Same guard pattern as typeIsUnionRelated below.
HighVariable high = vn.getHigh();
if (high == null) {
return null;
}
DataType dt = high.getDataType();
if (dt instanceof TypeDef) {
dt = ((TypeDef) dt).getBaseDataType();
}