Skip to content

Fix infinite loop in namedGroups() when matches empty string #16 #17

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 2 commits into from
Jan 26, 2021
Merged

Fix infinite loop in namedGroups() when matches empty string #16 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f6232d
Fix infinite loop in namedGroups() when matches empty string #16
tony19 Jan 26, 2021
b21c076
Tweak test comment
tony19 Jan 26, 2021
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
2 changes: 1 addition & 1 deletion src/main/java/com/google/code/regexp/Matcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ public List<Map<String, String>> namedGroups() {
}

int nextIndex = 0;
while (matcher.find(nextIndex)) {
while (!matcher.hitEnd() && matcher.find(nextIndex)) {
Map<String, String> matches = new LinkedHashMap<String, String>();

for (String groupName : groupNames) {
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/com/google/code/regexp/MatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,4 +754,13 @@ public void testNamedGroupsReturnsEmptyListWhenNoGroupPresent() {
final List<Map<String, String>> groups = matcher.namedGroups();
assertTrue(groups.isEmpty());
}

// Specify 1 second timeout to account for potential infinite loop (Issue #16)
@Test(timeout=1000)
public void testNamedGroupsReturnsWhenMatchesEmptyString() {
com.google.code.regexp.Matcher matcher = com.google.code.regexp.Pattern.compile("(?<foo>.*)").matcher("bar");
final List<Map<String, String>> groups = matcher.namedGroups();
assertEquals(1, groups.size());
assertEquals("bar", groups.get(0).get("foo"));
}
}