shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-09 01:18:39 +03:00
Code Releases Activity

Check for udev_get_dev_dir result

Browse Source 
Don't use NULL return value.
This commit is contained in:
Zdenek Kabelac 2012-03-01 21:16:05 +00:00
parent 465fe71f6c
commit 657826a255
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/commands/toolcontext.c
View File

@ -664,8 +664,9 @@ static int _init_dev_cache(struct cmd_context *cmd)
if ((device_list_from_udev = udev_is_running() ? if ((device_list_from_udev = udev_is_running() ?
find_config_tree_bool(cmd, "devices/obtain_device_list_from_udev", find_config_tree_bool(cmd, "devices/obtain_device_list_from_udev",
DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV) : 0)) { DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV) : 0)) {
udev_dir = udev_get_dev_dir(); if (!(udev_dir = udev_get_dev_dir()))
udev_dir_len = strlen(udev_dir); stack;
udev_dir_len = (udev_dir) ? strlen(udev_dir) : 0;
} }
init_obtain_device_list_from_udev(device_list_from_udev); init_obtain_device_list_from_udev(device_list_from_udev);
@ -687,7 +688,7 @@ static int _init_dev_cache(struct cmd_context *cmd)
return 0; return 0;
} }
if (device_list_from_udev) { if (device_list_from_udev && udev_dir) {
len = strlen(cv->v.str); len = strlen(cv->v.str);
len = udev_dir_len > len ? len : udev_dir_len; len = udev_dir_len > len ? len : udev_dir_len;
if (strncmp(udev_dir, cv->v.str, len) || if (strncmp(udev_dir, cv->v.str, len) ||