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

Merge "net: fix NPE when reading IP configurations"

Browse Source
This commit is contained in:
Chalard Jean
2021-11-26 07:04:34 +00:00
committed by Gerrit Code Review
parent bf7cc5b5d7 4d7813dacc
commit 53cf445e6a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/net/IpConfigStore.java
View File

@@ -322,8 +322,11 @@ public class IpConfigStore {
gateway = InetAddresses.parseNumericAddress(in.readUTF()); gateway = InetAddresses.parseNumericAddress(in.readUTF());
} }
// If the destination is a default IPv4 route, use the gateway // If the destination is a default IPv4 route, use the gateway
// address unless already set. // address unless already set. If there is no destination, assume
if (dest.getAddress() instanceof Inet4Address // it is default route and use the gateway address in all cases.
if (dest == null) {
gatewayAddress = gateway;
} else if (dest.getAddress() instanceof Inet4Address
&& dest.getPrefixLength() == 0 && gatewayAddress == null) { && dest.getPrefixLength() == 0 && gatewayAddress == null) {
gatewayAddress = gateway; gatewayAddress = gateway;
} else { } else {