Merge pull request #14284 from yuwata/network-fix-segfault-14283

network: fix segfault in parsing SendOption=
test-network: add a test case for SendOption=
2019-12-09 13:33:36 -08:00 · 2019-12-10 01:28:09 +09:00 · 2019-12-10 01:28:09 +09:00
2 changed files with 2 additions and 1 deletions
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@ -279,7 +279,7 @@ int config_parse_dhcp_send_option(

        _cleanup_(sd_dhcp_option_unrefp) sd_dhcp_option *opt = NULL, *old = NULL;
        _cleanup_free_ char *word = NULL, *q = NULL;
-        OrderedHashmap **options = userdata;
+        OrderedHashmap **options = data;
        union in_addr_union addr;
        DHCPOptionDataType type;
        uint8_t u, uint8_data;
--- a/test/test-network/conf/dhcp-client-ipv4-only-ipv6-disabled.network
+++ b/test/test-network/conf/dhcp-client-ipv4-only-ipv6-disabled.network
@ -7,3 +7,4 @@ IPv6AcceptRA=false

 [DHCPv4]
 RoutesToDNS=yes
+SendOption=12:string:test
Author	SHA1	Message	Date
Anita Zhang	dd1b315d22	Merge pull request #14284 from yuwata/network-fix-segfault-14283 network: fix segfault in parsing SendOption=	2019-12-09 13:33:36 -08:00
Yu Watanabe	0810e6d787	test-network: add a test case for SendOption=	2019-12-10 01:28:09 +09:00
Yu Watanabe	83b56c70e6	network: fix segfault in parsing SendOption= Fixes #14283.	2019-12-10 01:28:09 +09:00