drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 23:23:52 +01:00
Code Issues Projects Releases Wiki Activity

Change device name to use a stack buffer

Browse Source 
This shuts up a scan-build warning about a memleak that looked like a false
positive but I couldn't get rid of.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2017-07-11 15:32:40 +10:00
committed by Benjamin Tissoires
parent 82d197462f
commit e021937867
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libratbag.c
View File

@@ -373,17 +373,21 @@ ratbag_assign_driver(struct ratbag_device *device,
return rc;
}
static inline char*
get_device_name(struct udev_device *device)
static int
get_device_name(struct udev_device *device,
char *name, size_t sz)
{
const char *prop;
prop = udev_prop_value(device, "NAME");
if (!prop)
return NULL;
return -EINVAL;
/* udev name is enclosed by " */
return strndup(&prop[1], strlen(prop) - 2);
sz = min(sz, strlen(prop) - 1);
snprintf(name, sz, "%s", &prop[1]);
return 0;
}
static inline int
@@ -413,7 +417,7 @@ ratbag_device_new_from_udev_device(struct ratbag *ratbag,
{
struct ratbag_device *device = NULL;
enum ratbag_error_code error = RATBAG_ERROR_DEVICE;
_cleanup_free_ char *name = NULL;
char name[128];
struct input_id id;
assert(ratbag != NULL);
@@ -426,8 +430,7 @@ ratbag_device_new_from_udev_device(struct ratbag *ratbag,
if (get_product_id(udev_device, &id) != 0)
goto out_err;
name = get_device_name(udev_device);
if (!name)
if (get_device_name(udev_device, name, sizeof(name)) != 0)
goto out_err;
device = ratbag_device_new(ratbag, udev_device, name, &id);