From 820ab01ddfdf3ddee150f9e84fbee71bae884dea Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 7 Nov 2016 19:36:26 +0100 Subject: kernel-device: ID_USB_INTERFACE_NUM should be read as an hex string The original g_udev_device_get_property_as_int() uses strtol() without an explicit base (i.e. 0) so that the base is autodetected from the string whenever possible (e.g. if prefixes with '0x' it is treated as a hexadecimal string). But, for ID_USB_INTERFACE_NUM, we explicitly require reading the number as an hex string, even if we don't have any '0x' prefix. Reported-by: Matthew Stanger --- src/kerneldevice/mm-kernel-device-udev.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/kerneldevice/mm-kernel-device-udev.c') diff --git a/src/kerneldevice/mm-kernel-device-udev.c b/src/kerneldevice/mm-kernel-device-udev.c index f4b47d88..7ad9b29c 100644 --- a/src/kerneldevice/mm-kernel-device-udev.c +++ b/src/kerneldevice/mm-kernel-device-udev.c @@ -579,6 +579,25 @@ kernel_device_get_property_as_int (MMKernelDevice *_self, return g_udev_device_get_property_as_int (self->priv->device, property); } +static guint +kernel_device_get_property_as_int_hex (MMKernelDevice *_self, + const gchar *property) +{ + MMKernelDeviceUdev *self; + const gchar *s; + guint out = 0; + + g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), -1); + + self = MM_KERNEL_DEVICE_UDEV (_self); + + if (!self->priv->device) + return -1; + + s = g_udev_device_get_property (self->priv->device, property); + return ((s && mm_get_uint_from_hex_str (s, &out)) ? out : 0); +} + /*****************************************************************************/ MMKernelDevice * @@ -767,6 +786,7 @@ mm_kernel_device_udev_class_init (MMKernelDeviceUdevClass *klass) kernel_device_class->get_property = kernel_device_get_property; kernel_device_class->get_property_as_boolean = kernel_device_get_property_as_boolean; kernel_device_class->get_property_as_int = kernel_device_get_property_as_int; + kernel_device_class->get_property_as_int_hex = kernel_device_get_property_as_int_hex; properties[PROP_UDEV_DEVICE] = g_param_spec_object ("udev-device", -- cgit v1.2.3-70-g09d2