From 2d0ac5f5fe8983e8f1211fa5e261bbf07d5721b5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 21 May 2021 12:42:49 +0200 Subject: [PATCH] dhcp/nettools: fix crash with empty DHCP option 40 (NIS domain name) nm_utils_buf_utf8safe_escape() returns NULL for an empty string. Fixes: 6c8a9e8bd607 ('dhcp/nettools: validate nis-domain option (40) differently') --- src/core/dhcp/nm-dhcp-nettools.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c index 176dfc425f..e6a09138ff 100644 --- a/src/core/dhcp/nm-dhcp-nettools.c +++ b/src/core/dhcp/nm-dhcp-nettools.c @@ -696,8 +696,8 @@ lease_to_ip4_config(NMDedupMultiIndex *multi_idx, v_str = nm_utils_buf_utf8safe_escape((char *) l_data, l_data_len, 0, &to_free); - nm_dhcp_option_add_option(options, AF_INET, NM_DHCP_OPTION_DHCP4_NIS_DOMAIN, v_str); - nm_ip4_config_set_nis_domain(ip4_config, v_str); + nm_dhcp_option_add_option(options, AF_INET, NM_DHCP_OPTION_DHCP4_NIS_DOMAIN, v_str ?: ""); + nm_ip4_config_set_nis_domain(ip4_config, v_str ?: ""); } lease_parse_address_list(lease, ip4_config, NM_DHCP_OPTION_DHCP4_NIS_SERVERS, options, &sbuf);