From b40e5f4aa9f7e055491adf3cc6641172c5b5ad12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Wed, 3 Jul 2013 16:46:39 +0200 Subject: [PATCH] libnm-util: fix possible crash when IP method is NULL --- libnm-util/nm-setting-ip4-config.c | 2 +- libnm-util/nm-setting-ip6-config.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index eb9ab9dcb7..196ff1d36c 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -774,7 +774,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) if (list) { NMSettingIP6Config *s_ip6 = g_slist_nth_data (list, 0); if ( s_ip6 - && !strcmp (nm_setting_ip6_config_get_method (s_ip6), NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) { + && !g_strcmp0 (nm_setting_ip6_config_get_method (s_ip6), NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) { g_set_error (error, NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index aae3ee706c..7127724629 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -758,7 +758,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) if (list) { NMSettingIP4Config *s_ip4 = g_slist_nth_data (list, 0); if ( s_ip4 - && !strcmp (nm_setting_ip4_config_get_method (s_ip4), NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) { + && !g_strcmp0 (nm_setting_ip4_config_get_method (s_ip4), NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) { g_set_error (error, NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,