diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-05-16 14:11:51 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-05-16 15:20:09 +0200 |
| commit | f520a3933b8d410701114bd80b175a188a1a622a (patch) | |
| tree | 76332e0126bde0e0e4ff24897c732e87b43bd7c0 | |
| parent | 1e3406e6770e9473ab275c8c0852d4e9a4a4cba0 (diff) | |
| download | NetworkManager-th/sanitize-non-utf8-v1.tar.gz | |
device: sanitze UTF-8 values for D-Busth/sanitize-non-utf8-v1
ip link add name $'d\xccf' type dummy
| -rw-r--r-- | src/devices/nm-device.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 9966bf9ac8..e5c1d87c0b 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -13940,14 +13940,14 @@ get_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_UDI: - g_value_set_string (value, priv->udi); + nm_g_value_set_string_utf8safe (value, priv->udi, NULL); break; case PROP_IFACE: - g_value_set_string (value, priv->iface); + nm_g_value_set_string_utf8safe (value, priv->iface, "_"); break; case PROP_IP_IFACE: if (ip_config_valid (priv->state)) - g_value_set_string (value, nm_device_get_ip_iface (self)); + nm_g_value_set_string_utf8safe (value, nm_device_get_ip_iface (self), "_"); else g_value_set_string (value, NULL); break; @@ -13955,13 +13955,13 @@ get_property (GObject *object, guint prop_id, g_value_set_int (value, priv->ifindex); break; case PROP_DRIVER: - g_value_set_string (value, priv->driver); + nm_g_value_set_string_utf8safe (value, priv->driver, NULL); break; case PROP_DRIVER_VERSION: - g_value_set_string (value, priv->driver_version); + nm_g_value_set_string_utf8safe (value, priv->driver_version, NULL); break; case PROP_FIRMWARE_VERSION: - g_value_set_string (value, priv->firmware_version); + nm_g_value_set_string_utf8safe (value, priv->firmware_version, NULL); break; case PROP_CAPABILITIES: g_value_set_uint (value, (priv->capabilities & ~NM_DEVICE_CAP_INTERNAL_MASK)); @@ -14017,7 +14017,7 @@ get_property (GObject *object, guint prop_id, g_value_set_boolean (value, priv->nm_plugin_missing); break; case PROP_TYPE_DESC: - g_value_set_string (value, priv->type_desc); + nm_g_value_set_string_utf8safe (value, priv->type_desc, NULL); break; case PROP_RFKILL_TYPE: g_value_set_uint (value, priv->rfkill_type); |