github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-25 02:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored the test run of GrokAssembly to avoid double-closing

Browse Source 
Former-commit-id: 8279c075543071cdebf9c1433b6e0b1b0366ed59
This commit is contained in:
Will Stranathan
2014-02-01 09:33:47 -05:00
parent 60625b9978
commit c9ac7401e8
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
View File

@@ -168,13 +168,29 @@ public class AssemblyAnalyzer extends AbstractAnalyzer {
while ((bread = is.read(buff)) >= 0) { while ((bread = is.read(buff)) >= 0) {
fos.write(buff, 0, bread); fos.write(buff, 0, bread);
} }
fos.flush();
fos.close();
fos = null;
grokAssemblyExe = tempFile; grokAssemblyExe = tempFile;
// Set the temp file to get deleted when we're done // Set the temp file to get deleted when we're done
grokAssemblyExe.deleteOnExit(); grokAssemblyExe.deleteOnExit();
LOG.log(Level.INFO, "Extracted GrokAssembly.exe to {0}", grokAssemblyExe.getPath()); LOG.log(Level.INFO, "Extracted GrokAssembly.exe to {0}", grokAssemblyExe.getPath());
} catch (IOException ioe) {
LOG.log(Level.WARNING, "Could not extract GrokAssembly.exe: {0}", ioe.getMessage());
throw new AnalysisException("Could not extract GrokAssembly.exe", ioe);
} finally {
if (fos != null) {
try {
fos.close();
} catch (Exception e) {
LOG.fine("Error closing output stream");
}
}
if (is != null) {
try {
is.close();
} catch (Exception e) {
LOG.fine("Error closing input stream");
}
}
}
// Now, need to see if GrokAssembly actually runs from this location. // Now, need to see if GrokAssembly actually runs from this location.
final List<String> args = buildArgumentList(); final List<String> args = buildArgumentList();
@@ -194,22 +210,6 @@ public class AssemblyAnalyzer extends AbstractAnalyzer {
} }
builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
} finally {
if (fos != null) {
try {
fos.close();
} catch (Exception e) {
LOG.fine("Error closing output stream");
}
}
if (is != null) {
try {
is.close();
} catch (Exception e) {
LOG.fine("Error closing input stream");
}
}
}
} }
@Override @Override