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

Merge "Throw IllegalArgumentException on invalid hex-strings."

Browse Source
This commit is contained in:
Narayan Kamath
2014-12-29 16:08:32 +00:00
committed by Gerrit Code Review
parent 5ae63a258b 1653b1dd69
commit 5106dd44f9
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/MountService.java
View File

@@ -2155,7 +2155,7 @@ class MountService extends IMountService.Stub
} }
} }
private String toHex(String password) { private static String toHex(String password) {
if (password == null) { if (password == null) {
return ""; return "";
} }
@@ -2163,18 +2163,12 @@ class MountService extends IMountService.Stub
return new String(HexEncoding.encode(bytes)); return new String(HexEncoding.encode(bytes));
} }
private String fromHex(String hexPassword) { private static String fromHex(String hexPassword) throws IllegalArgumentException {
if (hexPassword == null) { if (hexPassword == null) {
return null; return null;
} }
final byte[] bytes; final byte[] bytes = HexEncoding.decode(hexPassword.toCharArray(), false);
try {
bytes = HexEncoding.decode(hexPassword.toCharArray(), false);
} catch (IllegalArgumentException e) {
return null;
}
return new String(bytes, StandardCharsets.UTF_8); return new String(bytes, StandardCharsets.UTF_8);
} }