Skip to content

[COLLECTIONS-714] Throw exception when put \u0000 to trie #99

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

Open
dota17 wants to merge 3 commits into
base: master
Choose a base branch
from
+22 −0
Open

[COLLECTIONS-714] Throw exception when put \u0000 to trie #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fc5a86
For fix issue 714
dota17 Oct 30, 2019
3068248
For fix issue 714
dota17 Oct 30, 2019
659eb8a
modify the message of exception
dota17 Nov 4, 2019
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
3 changes: 3 additions & 0 deletions src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ public int bitIndex(final String key, final int offsetInBits, final int lengthIn
k = 0;
} else {
k = key.charAt(index1);
if (k == 0) {
throw new IllegalArgumentException("Character '\\u0000' is not supported in the key.");
}
}

if (other == null || index2 >= endIndex2) {
Expand Down
19 changes: 19 additions & 0 deletions src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.ConcurrentModificationException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
Expand Down Expand Up @@ -427,6 +428,24 @@ public void testPrefixMapClearUsingRemove() {
assertEquals(Arrays.asList(2, 3, 7, 1), new ArrayList<>(trie.values()));
}

public void testNullTerminatedKey() {
// COLLECTIONS-714
PatriciaTrie<Integer> trie = new PatriciaTrie<>();
try {
trie.put("x\u0000", 1);
} catch (IllegalArgumentException e) {
// expected
}

Map<String, Integer> map = new HashMap<>();
map.put("x\u0000", 1);
try {
trie = new PatriciaTrie<>(map);
} catch (IllegalArgumentException e) {
// expected
}
}

//-----------------------------------------------------------------------

@Override
Expand Down