X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fdhcpv6.c;h=574b19eb16c021cec845d3514b4acd81f530d217;hb=46d7e52dcabccff5e010a6aa7232fbbfea1abecb;hp=bf764c8b89af737bb0d77a84c6dd7668abdded87;hpb=4cd19238f5499623391ebf74c74af03905a14ef8;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index bf764c8..574b19e 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -291,7 +291,8 @@ static void info_req_cb(GDHCPClient *dhcp_client, gpointer user_data)
 
 		dhcp->nameservers = nameservers;
 
-		for (i = 0; dhcp->nameservers[i] != NULL; i++)
+		for (i = 0; dhcp->nameservers != NULL &&
+					dhcp->nameservers[i] != NULL; i++)
 			__connman_service_nameserver_append(service,
 						dhcp->nameservers[i],
 						FALSE);
@@ -318,7 +319,8 @@ static void info_req_cb(GDHCPClient *dhcp_client, gpointer user_data)
 
 		dhcp->timeservers = timeservers;
 
-		for (i = 0; dhcp->timeservers[i] != NULL; i++)
+		for (i = 0; dhcp->timeservers != NULL &&
+					dhcp->timeservers[i] != NULL; i++)
 			__connman_service_timeserver_append(service,
 							dhcp->timeservers[i]);
 	} else
@@ -469,7 +471,8 @@ static int set_addresses(GDHCPClient *dhcp_client,
 
 		dhcp->nameservers = nameservers;
 
-		for (i = 0; dhcp->nameservers[i] != NULL; i++)
+		for (i = 0; dhcp->nameservers != NULL &&
+					dhcp->nameservers[i] != NULL; i++)
 			__connman_service_nameserver_append(service,
 							dhcp->nameservers[i],
 							FALSE);
@@ -496,7 +499,8 @@ static int set_addresses(GDHCPClient *dhcp_client,
 
 		dhcp->timeservers = timeservers;
 
-		for (i = 0; dhcp->timeservers[i] != NULL; i++)
+		for (i = 0; dhcp->timeservers != NULL &&
+					dhcp->timeservers[i] != NULL; i++)
 			__connman_service_timeserver_append(service,
 							dhcp->timeservers[i]);
 	} else