fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-01 11:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nmcli/connections.c
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); 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_name = check_valid_name(sett, valid_settings_main, valid_settings_port, NULL);
setting = nm_meta_setting_info_editor_new_setting( if (setting_name) {
nm_meta_setting_info_editor_find_by_name(setting_name, FALSE), setting = nm_meta_setting_info_editor_new_setting(
NM_META_ACCESSOR_SETTING_INIT_TYPE_DEFAULT); nm_meta_setting_info_editor_find_by_name(setting_name, FALSE),
NM_META_ACCESSOR_SETTING_INIT_TYPE_DEFAULT);
}
} else } else
setting = nm_g_object_ref(nmc_tab_completion.setting); setting = nm_g_object_ref(nmc_tab_completion.setting);