From 045b166ac27c3b7a67993b029f03088042bf4d5a Mon Sep 17 00:00:00 2001
From: Stan Chesnutt <chesnutt@google.com>
Date: Wed, 2 Feb 2011 12:10:21 -0800
Subject: 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
---
 core/java/android/net/dhcp/DhcpPacket.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'core/java/android/net')

diff --git a/core/java/android/net/dhcp/DhcpPacket.java b/core/java/android/net/dhcp/DhcpPacket.java
index e009f70..7d2bd69 100644
--- a/core/java/android/net/dhcp/DhcpPacket.java
+++ b/core/java/android/net/dhcp/DhcpPacket.java
@@ -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;
-- 
cgit v1.1