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

Commit 045b166a authored by Stan Chesnutt's avatar Stan Chesnutt
Browse files

Provide an empty List of dns servers, protecting against an NPE if the 

DHCP server omits the list of DNS servers from the DHCP-OFFER packet.

Change-Id: I4cdb3d47f36ecceaef390948741c0632067ee8ba
parent dd1729b9

core/java/android/net/dhcp/DhcpPacket.java

+1 −2
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ abstract class DhcpPacket { 
        InetAddress nextIp;

        InetAddress relayIp;

        byte[] clientMac;

        List<InetAddress> dnsServers = null;

        List<InetAddress> dnsServers = new ArrayList<InetAddress>();

        InetAddress gateway = null; // aka router

        Integer leaseTime = null;

        InetAddress serverIdentifier = null;
@@ -684,7 +684,6 @@ abstract class DhcpPacket { 
                        expectedLen = 4;

                        break;

                    case DHCP_DNS_SERVER:

                        dnsServers = new ArrayList<InetAddress>();

                        expectedLen = 0;



                        for (expectedLen = 0; expectedLen < optionLen;