merge: branch 'lr/sad-nmcli-edit'

nmcli/edit: fix an assertion failure when tab-completing bad setting name

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2014
This commit is contained in:
Íñigo Huguet 2024-08-21 05:41:12 +00:00
commit 57c19db32b

View file

@ -6637,9 +6637,11 @@ get_setting_and_property(const char *prompt,
valid_settings_port = nm_meta_setting_info_valid_parts_for_port_type(s_type, NULL);
setting_name = check_valid_name(sett, valid_settings_main, valid_settings_port, NULL);
setting = nm_meta_setting_info_editor_new_setting(
nm_meta_setting_info_editor_find_by_name(setting_name, FALSE),
NM_META_ACCESSOR_SETTING_INIT_TYPE_DEFAULT);
if (setting_name) {
setting = nm_meta_setting_info_editor_new_setting(
nm_meta_setting_info_editor_find_by_name(setting_name, FALSE),
NM_META_ACCESSOR_SETTING_INIT_TYPE_DEFAULT);
}
} else
setting = nm_g_object_ref(nmc_tab_completion.setting);