Skip to content

fix: comparison of CPE versions for large numbers #285

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

Closed
wants to merge 1 commit into from
Closed

fix: comparison of CPE versions for large numbers #285

Show file tree
Hide file tree
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
13 changes: 6 additions & 7 deletions src/main/java/us/springett/parsers/cpe/Cpe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
import us.springett.parsers.cpe.values.Part;
import us.springett.parsers.cpe.util.Convert;
import java.io.Serializable;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -649,8 +651,8 @@ public static Relation compareAttribute(final String left, final String right) {
}
//10 11 14 17
if (containsSpecialCharacter(left)) {
Pattern p = Convert.wellFormedToPattern(left.toLowerCase());
Matcher m = p.matcher(right.toLowerCase());
Pattern p = Convert.wellFormedToPattern(left.toLowerCase(Locale.ROOT));
Matcher m = p.matcher(right.toLowerCase(Locale.ROOT));
return m.matches() ? Relation.SUPERSET : Relation.DISJOINT;
}
return Relation.DISJOINT;
Expand Down Expand Up @@ -812,12 +814,9 @@ protected static int compareVersions(String left, String right) {
for (int x = 0; x < subMax; x++) {
if (isPositiveInteger(subLeft.get(x)) && isPositiveInteger(subRight.get(x))) {
try {
result = Long.valueOf(subLeft.get(x)).compareTo(Long.valueOf(subRight.get(x)));
result = new BigInteger(subLeft.get(x)).compareTo(new BigInteger(subRight.get(x)));
} catch (NumberFormatException ex) {
//infeasible path - unless one of the values is larger then a long?
if (!subLeft.get(x).equalsIgnoreCase(subRight.get(x))) {
result = subLeft.get(x).compareTo(subRight.get(x));
}
result = subLeft.get(x).compareTo(subRight.get(x));
}
} else {
result = subLeft.get(x).compareTo(subRight.get(x));
Expand Down
Loading