Skip to content

fix: improve VulnerableSoftware comparison #8031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2025
Merged

fix: improve VulnerableSoftware comparison #8031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,25 @@ public VulnerableSoftware(Part part, String vendor, String product, String versi
}
//CSON: ParameterNumber

/**
* Normalizes null and empty strings to null for consistent comparison.
* @param s the string to normalize
* @return null if s is null or empty, otherwise s
*/
private static String normalizeForComparison(String s) {
return (s == null || s.isEmpty()) ? null : s;
}

@Override
public int compareTo(@NotNull ICpe o) {
if (o instanceof VulnerableSoftware) {
final VulnerableSoftware other = (VulnerableSoftware) o;
return new CompareToBuilder()
.appendSuper(super.compareTo(other))
.append(versionStartIncluding, other.versionStartIncluding)
.append(versionStartExcluding, other.versionStartExcluding)
.append(versionEndIncluding, other.versionEndIncluding)
.append(versionEndExcluding, other.versionEndExcluding)
.append(normalizeForComparison(versionStartIncluding), normalizeForComparison(other.versionStartIncluding))
.append(normalizeForComparison(versionStartExcluding), normalizeForComparison(other.versionStartExcluding))
.append(normalizeForComparison(versionEndIncluding), normalizeForComparison(other.versionEndIncluding))
.append(normalizeForComparison(versionEndExcluding), normalizeForComparison(other.versionEndExcluding))
.append(this.vulnerable, other.vulnerable)
.build();
} else if (o instanceof Cpe) {
Expand Down