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

Merge remote-tracking branch 'origin/GP-342_jpleasu_fix_ghidrajarbuilder_resource_leak' into Ghidra_9.2

Browse Source
This commit is contained in:
ghidravore 2020-10-28 12:12:32 -04:00
commit c10d1f1b50
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -754,7 +754,9 @@ public class GhidraJarBuilder implements GhidraLaunchable {
long modifiedTime = file.lastModified();
addToModuleTree(jarPath, module);
if (extensionPointSuffixPattern.matcher(jarPath).matches()) {
checkExtensionPointClass(jarPath, new FileInputStream(file));
try (FileInputStream inStream = new FileInputStream(file)) {
checkExtensionPointClass(jarPath, inStream);
}
}
if (prefix != null) {
@ -775,16 +777,16 @@ public class GhidraJarBuilder implements GhidraLaunchable {
return;
}
InputStream in = new FileInputStream(file);
try (InputStream in = new FileInputStream(file)) {
byte[] bytes = new byte[4096];
int numRead;
byte[] bytes = new byte[4096];
int numRead;
while ((numRead = in.read(bytes)) != -1) {
monitor.checkCanceled();
jarOut.write(bytes, 0, numRead);
while ((numRead = in.read(bytes)) != -1) {
monitor.checkCanceled();
jarOut.write(bytes, 0, numRead);
}
}
in.close();
jarOut.closeEntry();