Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a66de9c2 authored by Xiao Ma's avatar Xiao Ma
Browse files

Fix the potential NullPointerException. 

The networkAttributesParcelable retrieved from IpMemoryStore might be
null, it might cause crash with NullPointerException when attepmting
to read from the field on a null object reference.

Bug: 122710829
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Id7527199424e55f1e14836e81a5d1965d13013a2
parent fe283df7

services/net/java/android/net/ipmemorystore/NetworkAttributes.java

+4 −1
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ public class NetworkAttributes { 


    @Nullable

    private static InetAddress getByAddressOrNull(@Nullable final byte[] address) {

        if (null == address) return null;

        try {

            return InetAddress.getByAddress(address);

        } catch (UnknownHostException e) {
@@ -227,7 +228,9 @@ public class NetworkAttributes { 
        }



        /**

         * Set the lease expiry timestamp of assigned v4 address.

         * Set the lease expiry timestamp of assigned v4 address. Long.MAX_VALUE is used

         * to represent "infinite lease".

         *

         * @param assignedV4AddressExpiry The lease expiry timestamp of assigned v4 address.

         * @return This builder.

         */

services/net/java/android/net/ipmemorystore/OnNetworkAttributesRetrievedListener.java

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ public interface OnNetworkAttributesRetrievedListener { 
                // NonNull, but still don't crash the system server if null

                if (null != listener) {

                    listener.onNetworkAttributesRetrieved(

                            new Status(statusParcelable), l2Key,

                            new NetworkAttributes(networkAttributesParcelable));

                            new Status(statusParcelable), l2Key, null == networkAttributesParcelable

                                ? null : new NetworkAttributes(networkAttributesParcelable));

                }

            }