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

fixed bug causing false positives on CPE entries with a vendor or product descriptor that is two or less characters as part of fix for #229

Browse Source 
Former-commit-id: b4c9c8bcb2b5f542933747067b516b9247443d96
This commit is contained in:
Jeremy Long
2015-05-09 05:28:31 -04:00
parent 145bf70420
commit a6bb6cd170
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java
View File

@@ -422,17 +422,6 @@ public class CPEAnalyzer implements Analyzer {
* @return whether or not the EvidenceCollection contains the string * @return whether or not the EvidenceCollection contains the string
*/ */
private boolean collectionContainsString(EvidenceCollection ec, String text) { private boolean collectionContainsString(EvidenceCollection ec, String text) {
//<editor-fold defaultstate="collapsed" desc="This code fold contains an old version of the code, delete once more testing is done">
// String[] splitText = text.split("[\\s_-]");
//
// for (String search : splitText) {
// //final String search = text.replaceAll("[\\s_-]", "").toLowerCase();
// if (ec.containsUsedString(search)) {
// return true;
// }
// }
//</editor-fold>
//TODO - likely need to change the split... not sure if this will work for CPE with special chars //TODO - likely need to change the split... not sure if this will work for CPE with special chars
if (text == null) { if (text == null) {
return false; return false;
@@ -454,9 +443,16 @@ public class CPEAnalyzer implements Analyzer {
list.add(word); list.add(word);
} }
} }
if (tempWord != null && !list.isEmpty()) { if (tempWord != null) {
final String tmp = list.get(list.size() - 1) + tempWord; if (!list.isEmpty()) {
list.add(tmp); final String tmp = list.get(list.size() - 1) + tempWord;
list.add(tmp);
} else {
list.add(tempWord);
}
}
if (list.isEmpty()) {
return false;
} }
boolean contains = true; boolean contains = true;
for (String word : list) { for (String word : list) {