From f80464ea317780f7b0db3d9e6d1799f3a4915c81 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 30 Nov 2013 17:23:00 -0500 Subject: [PATCH] updated to use UTF-8 Former-commit-id: 61fc6d7e5feeedbc74988b5a57639c3e298d01de --- .../owasp/dependencycheck/suppression/SuppressionHandler.java | 1 + .../owasp/dependencycheck/suppression/SuppressionParser.java | 2 +- .../dependencycheck/suppression/SuppressionHandlerTest.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionHandler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionHandler.java index 5c17859b9..27551f83d 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionHandler.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionHandler.java @@ -133,6 +133,7 @@ public class SuppressionHandler extends DefaultHandler { rule.addCve(currentText.toString()); } else if (CVSS_BELOW.equals(qName)) { final float cvss = Float.parseFloat(currentText.toString()); + rule.addCvssBelow(cvss); } } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java index 0bfc0756f..ac415dbe6 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java @@ -82,7 +82,7 @@ public class SuppressionParser { xmlReader.setContentHandler(handler); final InputStream inputStream = new FileInputStream(file); - final Reader reader = new InputStreamReader(inputStream); //, "UTF-8"); + final Reader reader = new InputStreamReader(inputStream, "UTF-8"); final InputSource in = new InputSource(reader); //in.setEncoding("UTF-8"); diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java index a47dc4515..93165264a 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java @@ -83,7 +83,7 @@ public class SuppressionHandlerTest { xmlReader.setContentHandler(handler); InputStream inputStream = new FileInputStream(file); - Reader reader = new InputStreamReader(inputStream); //, "UTF-8"); + Reader reader = new InputStreamReader(inputStream, "UTF-8"); InputSource in = new InputSource(reader); //in.setEncoding("UTF-8");