Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #5999 ArrayIndexOutOfBounds for unicode in HttpURI segment (#6000) 

Fixed ArrayTrie to not throw if passed a unicode character.
This commit is contained in:
Greg Wilkins 2021-02-23 20:03:45 +01:00 committed by GitHub
parent 16241d7fcb
commit 8bd4a9fad8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java
View File

@ -337,6 +337,9 @@ public class HttpURITest
{"%2f/info", "//info", true}, {"%2f/info", "//info", true},
{"%2F/info", "//info", true}, {"%2F/info", "//info", true},
// Non ascii characters
{"http://localhost:9000/x\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32", "/x\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32", false},
{"http://localhost:9000/\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32", "/\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32\uD83C\uDF32", false},
}).map(Arguments::of); }).map(Arguments::of);
} }

4
jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java
View File

@ -204,6 +204,8 @@ public class ArrayTrie<V> extends AbstractTrie<V>
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
{ {
char c = s.charAt(offset + i); char c = s.charAt(offset + i);
if (c > 0x7f)
return null;
int index = __lookup[c & 0x7f]; int index = __lookup[c & 0x7f];
if (index >= 0) if (index >= 0)
{ {
@ -217,7 +219,7 @@ public class ArrayTrie<V> extends AbstractTrie<V>
char[] big = _bigIndex == null ? null : _bigIndex[t]; char[] big = _bigIndex == null ? null : _bigIndex[t];
if (big == null) if (big == null)
return null; return null;
t = big[c]; t = big[c & 0x7f];
if (t == 0) if (t == 0)
return null; return null;
} }