summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2012-05-09 13:48:25 +0300
committerPatrik Flykt <patrik.flykt@linux.intel.com>2012-05-09 17:18:57 +0300
commit041911b7b6e8abb9f7a7c61d00fb41b9729a9b68 (patch)
tree08cc07c95662b1ec8b5d0da76fdf11877061d131
parentb7c33195092db8991b0213a834d942427e81a0e3 (diff)
downloadconnman-041911b7b6e8abb9f7a7c61d00fb41b9729a9b68.tar.gz
connman-041911b7b6e8abb9f7a7c61d00fb41b9729a9b68.tar.bz2
connman-041911b7b6e8abb9f7a7c61d00fb41b9729a9b68.zip
dhcpv6: Check NULL pointer dereference
-rw-r--r--src/dhcpv6.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index bf764c8b..7d89bf7a 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