Changeset 136 for trunk/src/reglookup.c

Timestamp:

01/23/09 12:29:51 (15 years ago)

Author:

tim

Message:

fixed various integer issues and memory allocation issues

polished error message functions and added initial messages in a few places

File:

• trunk/src/reglookup.c (modified) (5 diffs)

trunk/src/reglookup.c

@@ -255 +255 @@
       if((new_buf = realloc(buf, buf_len)) == NULL)
       {
+        free(name);
         free(buf);
         free(iter);
@@ -372 +373 @@
   const REGFI_NK_REC* sub = NULL;
   char* path = NULL;
+  char* msgs = NULL;
   int key_type = regfi_type_str2val("KEY");
   bool print_this = true;
@@ -377 +379 @@
   root = cur = regfi_iterator_cur_key(iter);
   sub = regfi_iterator_first_subkey(iter);
-  
+  msgs = regfi_get_messages(iter->f);
+  if(msgs != NULL)
+    fprintf(stderr, "%s", msgs);
   if(root == NULL)
     bailOut(EX_DATAERR, "ERROR: root cannot be NULL.\n");
@@ -455 +459 @@
   /* Strip any potential value name at end of path */
   for(i=0; 
-      (path[i] != NULL) && (path[i+1] != NULL) 
-        && (i < REGFI_MAX_DEPTH+1+1);
+      (path[i] != NULL) && (path[i+1] != NULL) && (i < REGFI_MAX_DEPTH+1);
       i++)
-    tmp_path[i] = path[i];
-
+  { tmp_path[i] = path[i]; }
   tmp_path[i] = NULL;
 
@@ -471 +473 @@
     if(print_verbose)
       fprintf(stderr, "VERBOSE: Found final path element as root key.\n");
+    free(tmp_path);
     return 2;
   }