Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a bug where Uri can't parse IPv6 literal addresses." am: 54677a86d4

Browse Source 
am: 86ff3f4c7a

Change-Id: Iec4629bc84bb32185be7120a6f5dfc5e97a5dbff
This commit is contained in:
Chalard Jean
2018-10-19 06:14:19 -07:00
committed by android-build-merger
parent 4e6f39894b 86ff3f4c7a
commit 6997192f35
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/java/android/net/Uri.java
View File

@@ -1102,19 +1102,18 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
public String getHost() {
@SuppressWarnings("StringEquality")
boolean cached = (host != NOT_CACHED);
return cached ? host
: (host = parseHost());
return cached ? host : (host = parseHost());
}
private String parseHost() {
String authority = getEncodedAuthority();
final String authority = getEncodedAuthority();
if (authority == null) {
return null;
}
// Parse out user info and then port.
int userInfoSeparator = authority.lastIndexOf('@');
int portSeparator = authority.indexOf(':', userInfoSeparator);
int portSeparator = findPortSeparator(authority);
String encodedHost = portSeparator == NOT_FOUND
? authority.substring(userInfoSeparator + 1)
@@ -1132,16 +1131,8 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
}
private int parsePort() {
String authority = getEncodedAuthority();
if (authority == null) {
return -1;
}
// Make sure we look for the port separtor *after* the user info
// separator. We have URLs with a ':' in the user info.
int userInfoSeparator = authority.lastIndexOf('@');
int portSeparator = authority.indexOf(':', userInfoSeparator);
final String authority = getEncodedAuthority();
int portSeparator = findPortSeparator(authority);
if (portSeparator == NOT_FOUND) {
return -1;
}
@@ -1154,6 +1145,24 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
return -1;
}
}
private int findPortSeparator(String authority) {
if (authority == null) {
return NOT_FOUND;
}
// Reverse search for the ':' character that breaks as soon as a char that is neither
// a colon nor an ascii digit is encountered. Thanks to the goodness of UTF-16 encoding,
// it's not possible that a surrogate matches one of these, so this loop can just
// look for characters rather than care about code points.
for (int i = authority.length() - 1; i >= 0; --i) {
final int character = authority.charAt(i);
if (':' == character) return i;
// Character.isDigit would include non-ascii digits
if (character < '0' || character > '9') return NOT_FOUND;
}
return NOT_FOUND;
}
}
/**