yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 02:09:44 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2025-09-02 09:32:27 -04:00
commit 074ddc29bb
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/GhidraSourceBundle.java
View file

@ -324,6 +324,7 @@ public class GhidraSourceBundle extends GhidraBundle {
private static void findPackageDirs(List<String> packages, ResourceFile dir) { private static void findPackageDirs(List<String> packages, ResourceFile dir) {
boolean added = false; boolean added = false;
ResourceFile[] files = dir.listFiles(f -> f.isDirectory() || f.getName().endsWith(".java")); ResourceFile[] files = dir.listFiles(f -> f.isDirectory() || f.getName().endsWith(".java"));
if (files != null) {
for (ResourceFile file : files) { for (ResourceFile file : files) {
if (!file.getName().matches("internal|private")) { if (!file.getName().matches("internal|private")) {
if (file.isDirectory()) { if (file.isDirectory()) {
@ -336,6 +337,7 @@ public class GhidraSourceBundle extends GhidraBundle {
} }
} }
} }
}
@Override @Override
public List<BundleCapability> getAllCapabilities() throws GhidraBundleException { public List<BundleCapability> getAllCapabilities() throws GhidraBundleException {
@ -699,7 +701,9 @@ public class GhidraSourceBundle extends GhidraBundle {
ClassMapper mapper = new ClassMapper(binarySubdir); ClassMapper mapper = new ClassMapper(binarySubdir);
// for each source file, lookup class files by class name // for each source file, lookup class files by class name
for (ResourceFile sourceFile : sourceSubdir.listFiles()) { ResourceFile[] sourceSubdirs = sourceSubdir.listFiles();
if (sourceSubdirs != null) {
for (ResourceFile sourceFile : sourceSubdirs) {
if (sourceFile.isDirectory()) { if (sourceFile.isDirectory()) {
stack.push(sourceFile); stack.push(sourceFile);
} }
@ -710,6 +714,7 @@ public class GhidraSourceBundle extends GhidraBundle {
} }
} }
} }
}
// any remaining .class files are missing .java files // any remaining .class files are missing .java files
if (mapper.hasExtraClassFiles()) { if (mapper.hasExtraClassFiles()) {
discrepancy.found(null, mapper.extraClassFiles()); discrepancy.found(null, mapper.extraClassFiles());