projects
/
project
/
odhcpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
baee199
)
Fix a segfault in state-script handling
author
Steven Barth
<steven@midlink.org>
Fri, 17 Jan 2014 13:04:36 +0000
(14:04 +0100)
committer
Steven Barth
<steven@midlink.org>
Fri, 17 Jan 2014 13:04:36 +0000
(14:04 +0100)
src/dhcpv6-ia.c
patch
|
blob
|
history
diff --git
a/src/dhcpv6-ia.c
b/src/dhcpv6-ia.c
index
2e93bd0
..
88840a4
100644
(file)
--- a/
src/dhcpv6-ia.c
+++ b/
src/dhcpv6-ia.c
@@
-211,7
+211,7
@@
void dhcpv6_write_statefile(void)
if (iface->dhcpv6 != RELAYD_SERVER && iface->dhcpv4 != RELAYD_SERVER)
continue;
if (iface->dhcpv6 != RELAYD_SERVER && iface->dhcpv4 != RELAYD_SERVER)
continue;
- if (iface->dhcpv6 == RELAYD_SERVER) {
+ if (iface->dhcpv6 == RELAYD_SERVER
&& iface->ia_assignments.next
) {
struct dhcpv6_assignment *c;
list_for_each_entry(c, &iface->ia_assignments, head) {
if (c->clid_len == 0)
struct dhcpv6_assignment *c;
list_for_each_entry(c, &iface->ia_assignments, head) {
if (c->clid_len == 0)
@@
-262,7
+262,7
@@
void dhcpv6_write_statefile(void)
}
}
}
}
- if (iface->dhcpv4 == RELAYD_SERVER) {
+ if (iface->dhcpv4 == RELAYD_SERVER
&& iface->dhcpv4_assignments.next
) {
struct dhcpv4_assignment *c;
list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
char ipbuf[INET6_ADDRSTRLEN];
struct dhcpv4_assignment *c;
list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
char ipbuf[INET6_ADDRSTRLEN];