From d90d07c68be408617ef04c5b81b0566f7ad14d05 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 30 May 2014 05:26:03 -0400 Subject: [PATCH] added code to disable the analyzer if initialization fails Former-commit-id: 202baa329f07fb24921ce83660d596d46b71b663 --- .../org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 4778dc70f..ac18ec90a 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 @@ -205,6 +205,7 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { grokAssemblyExe.deleteOnExit(); LOGGER.log(Level.FINE, "analyzer.AssemblyAnalyzer.grokassembly.deployed", grokAssemblyExe.getPath()); } catch (IOException ioe) { + this.setEnabled(false); LOGGER.log(Level.WARNING, "analyzer.AssemblyAnalyzer.grokassembly.notdeployed", ioe.getMessage()); throw new AnalysisException("Could not extract GrokAssembly.exe", ioe); } finally { @@ -242,6 +243,7 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { LOGGER.warning("An error occurred with the .NET AssemblyAnalyzer, please see the log for more details."); LOGGER.fine("GrokAssembly.exe is not working properly"); grokAssemblyExe = null; + this.setEnabled(false); throw new AnalysisException("Could not execute .NET AssemblyAnalyzer"); } } catch (Throwable e) { @@ -250,6 +252,7 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { } else { LOGGER.warning("analyzer.AssemblyAnalyzer.grokassembly.initialization.failed"); LOGGER.log(Level.FINE, "analyzer.AssemblyAnalyzer.grokassembly.initialization.message", e.getMessage()); + this.setEnabled(false); throw new AnalysisException("An error occured with the .NET AssemblyAnalyzer", e); } } finally { @@ -261,7 +264,6 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { } } } - builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); }