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

Fix error path

Do not increase nr_filt in case of NULL ret value, since the error path
doesn't handle NULL pointers.
This commit is contained in:
Zdenek Kabelac 2012-05-23 13:02:36 +00:00
parent 8db4540263
commit 8cdb78d0dd
2 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.96 -
================================
Fix error paths for regex filter initialization.
Re-enable partial activation of non-thin LVs until it can be fixed. (2.02.90)
Fix alloc cling to cling to PVs already found with contiguous policy.
Fix cling policy not to behave like normal policy if no previous LV seg.

View File

@ -759,17 +759,19 @@ static struct dev_filter *_init_filter_components(struct cmd_context *cmd)
log_very_verbose("devices/filter not found in config file: "
"no regex filter installed");
else if (!(filters[nr_filt++] = regex_filter_create(cn->v))) {
else if (!(filters[nr_filt] = regex_filter_create(cn->v))) {
log_error("Failed to create regex device filter");
goto bad;
}
} else
nr_filt++;
/* device type filter. Required. */
cn = find_config_tree_node(cmd, "devices/types");
if (!(filters[nr_filt++] = lvm_type_filter_create(cmd->proc_dir, cn))) {
if (!(filters[nr_filt] = lvm_type_filter_create(cmd->proc_dir, cn))) {
log_error("Failed to create lvm type filter");
goto bad;
}
nr_filt++;
/* md component filter. Optional, non-critical. */
if (find_config_tree_bool(cmd, "devices/md_component_detection",