Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-28 12:15:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-1323 corrected NPE within LcsHintLoadSpecChooser

Browse Source
This commit is contained in:
ghidra1
2021-09-24 16:10:16 -04:00
parent fc5c6c9e7b
commit 564cab0b1b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LcsHintLoadSpecChooser.java
+2 -1
View File
@@ -58,8 +58,9 @@ public class LcsHintLoadSpecChooser implements LoadSpecChooser {
// Try to use a known LoadSpec that matches the desired language/compiler spec // Try to use a known LoadSpec that matches the desired language/compiler spec
Collection<LoadSpec> loadSpecs = loaderMap.get(loader); Collection<LoadSpec> loadSpecs = loaderMap.get(loader);
for (LoadSpec loadSpec : loadSpecs) { for (LoadSpec loadSpec : loadSpecs) {
// single loadSpec with null LCS pair may exist when no opinion was found
LanguageCompilerSpecPair lcsPair = loadSpec.getLanguageCompilerSpec(); LanguageCompilerSpecPair lcsPair = loadSpec.getLanguageCompilerSpec();
if (lcsPair.languageID.equals(languageID) && if (lcsPair != null && lcsPair.languageID.equals(languageID) &&
(compilerSpecID == null || lcsPair.compilerSpecID.equals(compilerSpecID))) { (compilerSpecID == null || lcsPair.compilerSpecID.equals(compilerSpecID))) {
return loadSpec; return loadSpec;
} }