OpenJDK / amber / amber
changeset 10422:83581a2cf49d
7041800: URI.equals may incorrectly return true with escaped octets
Reviewed-by: alanb, michaelm
| author | chegar |
|---|---|
| date | Thu, 01 Sep 2011 13:53:59 +0100 |
| parents | 2ee16a0f6df5 |
| children | 2c852092a4e5 |
| files | jdk/src/share/classes/java/net/URI.java jdk/test/java/net/URI/Test.java |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/share/classes/java/net/URI.java Thu Sep 01 06:45:00 2011 +0100 +++ b/jdk/src/share/classes/java/net/URI.java Thu Sep 01 13:53:59 2011 +0100 @@ -1711,6 +1711,8 @@ i++; continue; } + if (d != '%') + return false; i++; if (toLower(s.charAt(i)) != toLower(t.charAt(i))) return false;
--- a/jdk/test/java/net/URI/Test.java Thu Sep 01 06:45:00 2011 +0100 +++ b/jdk/test/java/net/URI/Test.java Thu Sep 01 13:53:59 2011 +0100 @@ -23,7 +23,7 @@ /* @test * @summary Unit test for java.net.URI - * @bug 4464135 4505046 4503239 4438319 4991359 4866303 7023363 + * @bug 4464135 4505046 4503239 4438319 4991359 4866303 7023363 7041800 * @author Mark Reinhold */ @@ -1428,6 +1428,8 @@ gt(s, new URI("http://jag:CafeBabe@java.sun.com:94/b/c/d?q#f")); lt(s, new URI("http://jag:cafebabe@java.sun.com:94/b/c/d?r#f")); lt(s, new URI("http://jag:cafebabe@java.sun.com:94/b/c/d?q#g")); + eq(new URI("http://host/a%00bcd"), new URI("http://host/a%00bcd")); + ne(new URI("http://host/a%00bcd"), new URI("http://host/aZ00bcd")); lt("p", "s:p"); lt("s:p", "T:p");