shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

device_mapper: solve no devices path

Browse Source 
Malloc needs to use sane value when names would be NULL.
Also for devices without 'uuid' return empty string instead of NULL.
This commit is contained in:
Zdenek Kabelac 2024-05-27 18:13:47 +02:00
parent 533a87d0ea
commit fbdd26a4a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
device_mapper/ioctl/libdm-iface.c
View File

@ -839,7 +839,7 @@ int dm_task_get_device_list(struct dm_task *dmt, struct dm_list **devs_list,
/* buffer for devs + sorted ptrs + dm_devs + aligned strings */
if (!(devs = malloc(sizeof(*devs) + cnt * (2 * sizeof(void*) + sizeof(*dm_dev)) +
(char*)names1 - (char*)names + 256)))
(!cnt ? 0 : (char*)names1 - (char*)names + 256))))
return_0;
dm_list_init(&devs->list);
@ -958,7 +958,7 @@ int dm_device_list_find_by_dev(const struct dm_list *devs_list,
if ((dm_dev_found = bsearch(findme, devs->sorted, devs->count, sizeof(void*),
_dm_dev_compare))) {
fname = (*dm_dev_found)->name;
fuuid = (*dm_dev_found)->uuid;
fuuid = (*dm_dev_found)->uuid ? : ""; /* Device without UUID */
ret = 1;
}