Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-16 15:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-4844: Fixed ClassSearcher exception when launching from single jar

Browse Source 
mode (Closes #6809)
This commit is contained in:
Ryan Kurtz 2024-08-13 09:16:59 -04:00
parent 22d967553d
commit 8509c3a9e4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/util/GhidraJarBuilder.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -621,7 +621,7 @@ public class GhidraJarBuilder implements GhidraLaunchable {
if (clazz == null) {
System.out.println("Couldn't load " + path);
}
else if (ClassSearcher.isClassOfInterest(clazz)) {
else {
extensionPointClasses.add(clazz.getName());
}
}

6
Ghidra/Framework/Generic/src/main/java/ghidra/util/classfinder/ClassSearcher.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -176,7 +176,7 @@ public class ClassSearcher {
}
List<Class<? extends T>> list = new ArrayList<>();
for (ClassFileInfo info : extensionPointSuffixToInfoMap.get(suffix)) {
for (ClassFileInfo info : extensionPointSuffixToInfoMap.getOrDefault(suffix, Set.of())) {
if (falsePositiveCache.contains(info)) {
continue;