LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix bug in MacAddress.fromString()"

Browse Source 
am: cdb84d2fc7

Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df
This commit is contained in:
Hugo Benichi
2017-12-05 09:47:50 +00:00
committed by android-build-merger
parent 2a20e7a677 21c7a52042
commit a31109c229
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/MacAddress.java
View File

@@ -280,9 +280,8 @@ public final class MacAddress implements Parcelable {
throw new IllegalArgumentException(addr + " was not a valid MAC address"); throw new IllegalArgumentException(addr + " was not a valid MAC address");
} }
long longAddr = 0; long longAddr = 0;
int index = ETHER_ADDR_LEN; for (int i = 0; i < parts.length; i++) {
while (index-- > 0) { int x = Integer.valueOf(parts[i], 16);
int x = Integer.valueOf(parts[index], 16);
if (x < 0 || 0xff < x) { if (x < 0 || 0xff < x) {
throw new IllegalArgumentException(addr + "was not a valid MAC address"); throw new IllegalArgumentException(addr + "was not a valid MAC address");
} }

3
tests/net/java/android/net/MacAddressTest.java
View File

@@ -161,6 +161,9 @@ public class MacAddressTest {
assertEquals(mac, MacAddress.fromString(stringRepr)); assertEquals(mac, MacAddress.fromString(stringRepr));
assertEquals(mac, MacAddress.fromBytes(bytesRepr)); assertEquals(mac, MacAddress.fromBytes(bytesRepr));
assertEquals(mac, MacAddress.fromString(MacAddress.stringAddrFromByteAddr(bytesRepr)));
assertEquals(mac, MacAddress.fromBytes(MacAddress.byteAddrFromStringAddr(stringRepr)));
} }
} }