diff options
| author | Adam Vartanian <flooey@google.com> | 2018-02-01 10:02:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-01 10:02:42 +0000 |
| commit | d9a3f2c201eb6bde63e1404fb2e41958dfb64604 (patch) | |
| tree | b2d13d92501159b8edf2806a22f0b1c64c28b23d /core/java | |
| parent | afb1b1aeb61ee8589fccc4b1b786c72b105266a1 (diff) | |
| parent | 54f1b302ab7cda7d0182be6728e9a4e0e335ebe7 (diff) | |
Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into cw-f-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/Uri.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java index a84f74a80859..6c069be07e3e 100644 --- a/core/java/android/net/Uri.java +++ b/core/java/android/net/Uri.java @@ -719,6 +719,10 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { LOOP: while (end < length) { switch (uriString.charAt(end)) { case '/': // Start of path + case '\\':// Start of path + // Per http://url.spec.whatwg.org/#host-state, the \ character + // is treated as if it were a / character when encountered in a + // host case '?': // Start of query case '#': // Start of fragment break LOOP; @@ -757,6 +761,10 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { case '#': // Start of fragment return ""; // Empty path. case '/': // Start of path! + case '\\':// Start of path! + // Per http://url.spec.whatwg.org/#host-state, the \ character + // is treated as if it were a / character when encountered in a + // host break LOOP; } pathStart++; |