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

network: fix segfault in parsing SendOption=
systemd · Dec 9, 2019 · dd1b315 · dd1b315
2 parents fb4b046 + 0810e6d
commit dd1b315
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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;

diff --git 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