From 51d81fab5db1155d4c6146aceeba88fca1e363b9 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Tue, 24 Nov 2015 05:34:34 -0500 Subject: [PATCH] grok assembly exe was hanging, reordered so input stream was processed before error stream to resolve the issue. --- .../org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java index 984ea8a22..6cde5a57c 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java @@ -118,6 +118,9 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { Document doc = null; try { final Process proc = pb.start(); + + doc = builder.parse(proc.getInputStream()); + // Try evacuating the error stream final String errorStream = IOUtils.toString(proc.getErrorStream(), "UTF-8"); if (null != errorStream && !errorStream.isEmpty()) { @@ -125,8 +128,6 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { } int rc = 0; - doc = builder.parse(proc.getInputStream()); - try { rc = proc.waitFor(); } catch (InterruptedException ie) {