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

Fix error path

Browse Source 
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 77ce00ddaa
commit 2439aa4bf1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.96 - 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) 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 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. Fix cling policy not to behave like normal policy if no previous LV seg.

8
lib/commands/toolcontext.c
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: " log_very_verbose("devices/filter not found in config file: "
"no regex filter installed"); "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"); log_error("Failed to create regex device filter");
goto bad; goto bad;
} } else
nr_filt++;
/* device type filter. Required. */ /* device type filter. Required. */
cn = find_config_tree_node(cmd, "devices/types"); 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"); log_error("Failed to create lvm type filter");
goto bad; goto bad;
} }
nr_filt++;
/* md component filter. Optional, non-critical. */ /* md component filter. Optional, non-critical. */
if (find_config_tree_bool(cmd, "devices/md_component_detection", if (find_config_tree_bool(cmd, "devices/md_component_detection",