Changeset 82 for trunk

Timestamp:

01/17/07 12:20:41 (18 years ago)

Author:

tim

Message:

bugfixes for path filtering

Location:

trunk

Files:

• lib/regfi.c (modified) (2 diffs)
• src/reglookup.c (modified) (2 diffs)

trunk/lib/regfi.c

@@ -1673 +1673 @@
        && strcasecmp(subkey->keyname, subkey_name) == 0)
       found = true;
-
-    regfi_key_free(subkey);
-    subkey = regfi_iterator_next_subkey(i);
+    else
+    {
+      regfi_key_free(subkey);
+      subkey = regfi_iterator_next_subkey(i);
+    }
   }
 
@@ -1684 +1686 @@
   }
 
+  regfi_key_free(subkey);
   return true;
 }

trunk/src/reglookup.c

@@ -758 +758 @@
             path_filter);
 
+  /* Special check for '/' path filter */
+  if(path[0] == NULL)
+  {
+    if(print_verbose)
+      fprintf(stderr, "VERBOSE: Found final path element as root key.\n");
+    return 2;
+  }
+
   if(!regfi_iterator_walk_path(iter, tmp_path))
   {
@@ -785 +793 @@
     if(print_verbose)
       fprintf(stderr, "VERBOSE: Found final path element as key.\n");
+
+    if(!regfi_iterator_down(iter))
+      bailOut(2, "ERROR: Unexpected error on traversing path filter key.\n");
+
     return 2;
   }