chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d9f07b
)
networkd: don't clear dhcpv6 lease timers if there's no previous lease
author
Steven Noonan
<steven@uplinklabs.net>
Fri, 4 Jul 2014 02:43:56 +0000
(19:43 -0700)
committer
Tom Gundersen
<teg@jklm.no>
Fri, 4 Jul 2014 09:34:43 +0000
(11:34 +0200)
If client->lease is NULL, dhcp6_lease_clear_timers will cause a segmentation
fault.
src/libsystemd-network/sd-dhcp6-client.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-network/sd-dhcp6-client.c
b/src/libsystemd-network/sd-dhcp6-client.c
index 8fdbbfe3201e62d4da0b4f37fc8884feb4f39798..a83778e9389c24334a2ff896f9e8568186862ae8 100644
(file)
--- a/
src/libsystemd-network/sd-dhcp6-client.c
+++ b/
src/libsystemd-network/sd-dhcp6-client.c
@@
-708,7
+708,8
@@
static int client_receive_reply(sd_dhcp6_client *client, DHCP6Message *reply,
return 0;
}
- dhcp6_lease_clear_timers(&client->lease->ia);
+ if (client->lease)
+ dhcp6_lease_clear_timers(&client->lease->ia);
client->lease = sd_dhcp6_lease_unref(client->lease);
client->lease = lease;