libnm-core/libnm-util: fix an assertion in adsl setting

(process:7799): GLib-CRITICAL **: g_ascii_strdown: assertion 'str != NULL' failed

diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c
index e3c1887..900e973 100644 (file)
--- a/libnm-core/nm-setting-adsl.c
+++ b/libnm-core/nm-setting-adsl.c
@@ -266,6 +266,7 @@ set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
        NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object);
+       const char *str;
 
        switch (prop_id) {
        case PROP_USERNAME:
@@ -281,11 +282,13 @@ set_property (GObject *object, guint prop_id,
                break;
        case PROP_PROTOCOL:
                g_free (priv->protocol);
-               priv->protocol = g_ascii_strdown (g_value_get_string (value), -1);
+               str = g_value_get_string (value);
+               priv->protocol = str ? g_ascii_strdown (str, -1) : NULL;
                break;
        case PROP_ENCAPSULATION:
                g_free (priv->encapsulation);
-               priv->encapsulation = g_ascii_strdown (g_value_get_string (value), -1);
+               str = g_value_get_string (value);
+               priv->encapsulation = str ? g_ascii_strdown (str, -1) : NULL;
                break;
        case PROP_VPI:
                priv->vpi = g_value_get_uint (value);

diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c
index c97d0a6..55d04ce 100644 (file)
--- a/libnm-util/nm-setting-adsl.c
+++ b/libnm-util/nm-setting-adsl.c
@@ -286,6 +286,7 @@ set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
        NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object);
+       const char *str;
 
        switch (prop_id) {
        case PROP_USERNAME:
@@ -301,11 +302,13 @@ set_property (GObject *object, guint prop_id,
                break;
        case PROP_PROTOCOL:
                g_free (priv->protocol);
-               priv->protocol = g_ascii_strdown (g_value_get_string (value), -1);
+               str = g_value_get_string (value);
+               priv->protocol = str ? g_ascii_strdown (str, -1) : NULL;
                break;
        case PROP_ENCAPSULATION:
                g_free (priv->encapsulation);
-               priv->encapsulation = g_ascii_strdown (g_value_get_string (value), -1);
+               str = g_value_get_string (value);
+               priv->encapsulation = str ? g_ascii_strdown (str, -1) : NULL;
                break;
        case PROP_VPI:
                priv->vpi = g_value_get_uint (value);