colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
(process:7799): GLib-CRITICAL **: g_ascii_strdown: assertion 'str != NULL' failed
This commit is contained in:
Jiří Klimeš
2015-09-18 10:42:10 +02:00
parent 5221180a20
commit 3d64d45d16
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libnm-core/nm-setting-adsl.c
View File

@@ -266,6 +266,7 @@ set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec) const GValue *value, GParamSpec *pspec)
{ {
NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object); NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object);
const char *str;
switch (prop_id) { switch (prop_id) {
case PROP_USERNAME: case PROP_USERNAME:
@@ -281,11 +282,13 @@ set_property (GObject *object, guint prop_id,
break; break;
case PROP_PROTOCOL: case PROP_PROTOCOL:
g_free (priv->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; break;
case PROP_ENCAPSULATION: case PROP_ENCAPSULATION:
g_free (priv->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; break;
case PROP_VPI: case PROP_VPI:
priv->vpi = g_value_get_uint (value); priv->vpi = g_value_get_uint (value);

7
libnm-util/nm-setting-adsl.c
View File

@@ -286,6 +286,7 @@ set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec) const GValue *value, GParamSpec *pspec)
{ {
NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object); NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object);
const char *str;
switch (prop_id) { switch (prop_id) {
case PROP_USERNAME: case PROP_USERNAME:
@@ -301,11 +302,13 @@ set_property (GObject *object, guint prop_id,
break; break;
case PROP_PROTOCOL: case PROP_PROTOCOL:
g_free (priv->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; break;
case PROP_ENCAPSULATION: case PROP_ENCAPSULATION:
g_free (priv->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; break;
case PROP_VPI: case PROP_VPI:
priv->vpi = g_value_get_uint (value); priv->vpi = g_value_get_uint (value);