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

network: fix segfault in parsing SendOption=
2019-12-09 13:33:36 -08:00
parent fb4b0465ab 0810e6d787
commit dd1b315d22
2 changed files with 2 additions and 1 deletions
@@ -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;
@@ -7,3 +7,4 @@ IPv6AcceptRA=false

 [DHCPv4]
 RoutesToDNS=yes
+SendOption=12:string:test