Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 12:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4946_dev747368_gnudemangler_npe'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-09-20 07:15:08 -04:00
commit c08736bf19
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemangler.java
View File

@ -77,7 +77,9 @@ public class GnuDemangler implements Demangler {
public DemangledObject demangle(MangledContext mangledContext)
throws DemangledException {
DemangledObject demangled = demangleInternal(mangledContext);
demangled.setMangledContext(mangledContext);
if (demangled != null) {
demangled.setMangledContext(mangledContext);
}
return demangled;
}