Skip to content

Fix UnsupportedOperationException in AbstractRegexCheckTrackingMatchers.onMethodInvocationFound #3331

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
alban-auzeill merged 1 commit into from
Dec 7, 2020
Merged

Fix UnsupportedOperationException in AbstractRegexCheckTrackingMatchers.onMethodInvocationFound #3331

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
6 changes: 6 additions & 0 deletions java-checks-test-sources/src/main/java/checks/regex/RegexLookaheadCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ public void test() {
f(compile("(?=a)ab").matcher("abc").find());
f(compile("(?=abc)ab").matcher("abc").matches()); // Noncompliant
f(compile("(?=abc)ab").matcher("abc").find());

// string regex and pattern regex share the same string literal
String pattern_str = "(?=a)b"; // Noncompliant
Pattern pattern = Pattern.compile(pattern_str);
f("".matches(pattern_str));
f(pattern.matcher("").matches());
}

abstract void f(Pattern pattern);
Expand Down
6 changes: 3 additions & 3 deletions ...-checks/src/main/java/org/sonar/java/checks/regex/AbstractRegexCheckTrackingMatchers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ private Optional<RegexParseResult> getRegexOperand(MethodInvocationTree mit) {
@Override
public void checkRegex(RegexParseResult regexForLiterals, ExpressionTree methodInvocationOrAnnotation) {
if (methodInvocationOrAnnotation.is(Tree.Kind.ANNOTATION)) {
methodsCalledOnRegex.put(regexForLiterals, Collections.emptyList());
methodsCalledOnRegex.put(regexForLiterals, new ArrayList<>());
return;
}
MethodInvocationTree mit = (MethodInvocationTree) methodInvocationOrAnnotation;
Expand All @@ -215,9 +215,9 @@ public void checkRegex(RegexParseResult regexForLiterals, ExpressionTree methodI
methodInvocationToRegex.put(mit, regexForLiterals);
methodsCalledOnRegex.put(regexForLiterals, new ArrayList<>());
} else if (trackedMethodMatchers().matches(mit)) {
methodsCalledOnRegex.put(regexForLiterals, Collections.singletonList(mit));
methodsCalledOnRegex.put(regexForLiterals, new ArrayList<>(Collections.singletonList(mit)));
} else {
methodsCalledOnRegex.put(regexForLiterals, Collections.emptyList());
methodsCalledOnRegex.put(regexForLiterals, new ArrayList<>());
}
}

Expand Down