Fix error path

Do not increase nr_filt in case of NULL ret value, since the error path
doesn't handle NULL pointers.

diff --git a/WHATS_NEW b/WHATS_NEW
index c196468966abd8675e06d9a82be5c8c26a3b9ff2..2e9f7102cc7d830ddb9082ae676472d943bd9aec 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -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.

diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index a352afe372750f5db5b3f18595b5b36dca529760..78f0801e5bef1b9bc80cb1ab52e45625e3e015b4 100644 (file)
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -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",