github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-15 08:13:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

correctly closed streams when extracting a gzip archive

Browse Source 
Former-commit-id: 0a0c917cc3e4c4a004823fba9b7f8ab53f90d557
This commit is contained in:
Jeremy Long
2014-11-16 06:21:02 -05:00
parent 127eafc9b3
commit 299350f655
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/DownloadTask.java
View File

@@ -260,26 +260,38 @@ public class DownloadTask implements Callable<Future<ProcessTask>> {
* @throws IOException thrown if there is an error extracting the file.
*/
private void extractGzip(File file) throws FileNotFoundException, IOException {
String originalPath = file.getPath();
final String originalPath = file.getPath();
File gzip = new File(originalPath + ".gz");
if (gzip.isFile()) {
gzip.delete();
}
file.renameTo(gzip);
file = new File(originalPath);
byte[] buffer = new byte[4096];
GZIPInputStream cin = new GZIPInputStream(new FileInputStream(gzip));
FileOutputStream out = new FileOutputStream(file);
int len;
while ((len = cin.read(buffer)) > 0) {
out.write(buffer, 0, len);
if (!file.renameTo(gzip)) {
throw new IOException("Unable to rename '" + file.getPath() + "'");
}
final File newfile = new File(originalPath);
final byte[] buffer = new byte[4096];
GZIPInputStream cin = null;
FileOutputStream out = null;
try {
cin = new GZIPInputStream(new FileInputStream(gzip));
out = new FileOutputStream(newfile);
int len;
while ((len = cin.read(buffer)) > 0) {
out.write(buffer, 0, len);
}
} finally {
if (cin != null) {
cin.close();
}
if (out != null) {
out.close();
}
if (gzip.isFile()) {
FileUtils.delete(gzip);
}
}
cin.close();
out.close();
FileUtils.delete(gzip);
}
}