From 0849051df28f8d2f688cdd6aad732d322937b7c6 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Tue, 7 Jun 2011 09:54:25 +0200 Subject: [PATCH] dhcp: Fix dhcp_invalidate NULL pointer access dhcp->nameservers can be NULL. This can be triggered with toggling the technologies switches fast enough. --- src/dhcp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dhcp.c b/src/dhcp.c index ab8ee5a..20fc599 100644 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -96,9 +96,11 @@ static void dhcp_invalidate(struct connman_dhcp *dhcp, connman_bool_t callback) __connman_service_set_pac(service, NULL); __connman_service_timeserver_remove(service, dhcp->timeserver); - for (i = 0; dhcp->nameservers[i] != NULL; i++) { - __connman_service_nameserver_remove(service, - dhcp->nameservers[i]); + if (dhcp->nameservers != NULL) { + for (i = 0; dhcp->nameservers[i] != NULL; i++) { + __connman_service_nameserver_remove(service, + dhcp->nameservers[i]); + } } __connman_ipconfig_address_remove(ipconfig); -- 2.7.4