From 041911b7b6e8abb9f7a7c61d00fb41b9729a9b68 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Wed, 9 May 2012 13:48:25 +0300 Subject: [PATCH] dhcpv6: Check NULL pointer dereference --- src/dhcpv6.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dhcpv6.c b/src/dhcpv6.c index bf764c8..7d89bf7 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 -- 2.7.4