commit ca9a233b8d6d8a66044cfab04e29dce1fa195cae
author Chalard Jean <jchalard@google.com> Fri Nov 26 07:04:34 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 26 07:04:34 2021 +0000
tree 7967e5b64f81f574363cc2e582beb8ce655b7d6d
parent e5864eb63243ce48c13bbc6f0b4c88c2419afef8
parent 92304baa2c8e08b43deda73c1c0952109eeb0bba

Merge "net: fix NPE when reading IP configurations"

services/core/java/com/android/server/net/IpConfigStore.java

diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java
index df1eb6d..d17dbde 100644
--- a/services/core/java/com/android/server/net/IpConfigStore.java
+++ b/services/core/java/com/android/server/net/IpConfigStore.java
@@ -322,8 +322,11 @@
                                     gateway = InetAddresses.parseNumericAddress(in.readUTF());
                                 }
                                 // If the destination is a default IPv4 route, use the gateway
-                                // address unless already set.
-                                if (dest.getAddress() instanceof Inet4Address
+                                // address unless already set. If there is no destination, assume
+                                // 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) {
                                     gatewayAddress = gateway;
                                 } else {