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

Merge "Properly handle whitespace in domain entries" into nyc-dev am: 2e6aa19

Browse Source 
am: 1b55d74

* commit '1b55d74981d13031528e001c35840fab35c71e98':
  Properly handle whitespace in domain entries
This commit is contained in:
Chad Brubaker
2016-03-23 22:52:39 +00:00
committed by android-build-merger
parent d0f1fdc44d 1b55d74981
commit 1cf689b0fd
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/security/net/config/XmlConfigSource.java
View File

@@ -111,7 +111,7 @@ public class XmlConfigSource implements ConfigSource {
if (parser.next() != XmlPullParser.TEXT) {
throw new ParserException(parser, "Missing pin digest");
}
String digest = parser.getText();
String digest = parser.getText().trim();
byte[] decodedDigest = null;
try {
decodedDigest = Base64.decode(digest, 0);
@@ -168,7 +168,7 @@ public class XmlConfigSource implements ConfigSource {
if (parser.next() != XmlPullParser.TEXT) {
throw new ParserException(parser, "Domain name missing");
}
String domain = parser.getText().toLowerCase(Locale.US);
String domain = parser.getText().trim().toLowerCase(Locale.US);
if (parser.next() != XmlPullParser.END_TAG) {
throw new ParserException(parser, "domain contains additional elements");
}