projects
/
platform
/
upstream
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
7773a6c
)
dhcpv6: Check NULL pointer dereference
author
Jukka Rissanen
<jukka.rissanen@linux.intel.com>
Thu, 10 May 2012 06:43:46 +0000
(09:43 +0300)
committer
Patrik Flykt
<patrik.flykt@linux.intel.com>
Thu, 10 May 2012 07:42:42 +0000
(10:42 +0300)
src/dhcpv6.c
patch
|
blob
|
history
diff --git
a/src/dhcpv6.c
b/src/dhcpv6.c
index
7d89bf7
..
574b19e
100644
(file)
--- a/
src/dhcpv6.c
+++ b/
src/dhcpv6.c
@@
-471,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);
@@
-498,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