dhcpv6: Check NULL pointer dereference
authorJukka Rissanen <jukka.rissanen@linux.intel.com>
Wed, 9 May 2012 10:48:25 +0000 (13:48 +0300)
committerPatrik Flykt <patrik.flykt@linux.intel.com>
Wed, 9 May 2012 14:18:57 +0000 (17:18 +0300)
src/dhcpv6.c

index bf764c8..7d89bf7 100644 (file)
@@ -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