summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2017-04-12 09:10:14 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2017-04-12 10:17:43 +0200
commit3509af90c9f8d4f26917811c522b6f40ef58b362 (patch)
treed8ff92e729a7de7b78c1e9f15b538e13f0ea11cc
parent69fd96118e9a5e6b613644c2cb61911d554e7f3b (diff)
downloadNetworkManager-3509af90c9f8d4f26917811c522b6f40ef58b362.tar.gz
clients: avoid crash when property meta data do not exist
This happens for object properties we don't implement yet in NM and nmcli, for example ipv6.dad-timeout or ipv6.dhcp-timeout.
-rw-r--r--clients/common/nm-meta-setting-access.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c
index 5f538bf87a..6da71448fc 100644
--- a/clients/common/nm-meta-setting-access.c
+++ b/clients/common/nm-meta-setting-access.c
@@ -116,6 +116,8 @@ nm_meta_property_info_find_by_name (const char *setting_name, const char *proper
return NULL;
property_info = nm_meta_setting_info_editor_get_property_info (setting_info, property_name);
+ if (!property_info)
+ return NULL;
nm_assert (property_info->setting_info == setting_info);
@@ -132,6 +134,8 @@ nm_meta_property_info_find_by_setting (NMSetting *setting, const char *property_
if (!setting_info)
return NULL;
property_info = nm_meta_setting_info_editor_get_property_info (setting_info, property_name);
+ if (!property_info)
+ return NULL;
nm_assert (property_info->setting_info == setting_info);
nm_assert (property_info == nm_meta_property_info_find_by_name (nm_setting_get_name (setting), property_name));