Changeset 140 for trunk/lib

Timestamp:

02/09/09 14:53:39 (16 years ago)

Author:

tim

Message:

Misc error message changes.

Added and removed some comments.

Updated TODO list.

File:

• trunk/lib/regfi.c (modified) (8 diffs)

trunk/lib/regfi.c

@@ -200 +200 @@
   if(fo != ret_val)
     fo[-1] = '\0';
-
-  /* XXX: what was this old VI flag for??
-     XXX: Is this check right?  0xF == 1|2|4|8, which makes it redundant...
-  if (flags == 0xF) {
-    if (some) strcat(flg_output, " ");
-    some = 1;
-    strcat(flg_output, "VI");
-  }
-  */
 
   return ret_val;
@@ -814 +805 @@
   ret_val->magic[1] = sk_header[1];
 
-  /* XXX: Can additional validation be added here? */
   ret_val->unknown_tag = SVAL(sk_header, 0x2);
   ret_val->prev_sk_off = IVAL(sk_header, 0x4);
@@ -821 +811 @@
   ret_val->desc_size = IVAL(sk_header, 0x10);
 
+  if(ret_val->prev_sk_off != (ret_val->prev_sk_off & 0xFFFFFFF8) 
+     || ret_val->next_sk_off != (ret_val->next_sk_off & 0xFFFFFFF8))
+  {
+    regfi_add_message(file, REGFI_MSG_WARN, "SK record's next/previous offsets"
+                      " are not a multiple of 8 while parsing SK record at"
+                      " offset 0x%.8X.", offset);
+    free(ret_val);
+    return NULL;
+  }
+
   if(ret_val->desc_size + REGFI_SK_MIN_LENGTH > ret_val->cell_size)
   {
-    regfi_add_message(file, REGFI_MSG_ERROR, "Security descriptor too large for"
+    regfi_add_message(file, REGFI_MSG_WARN, "Security descriptor too large for"
                       " cell while parsing SK record at offset 0x%.8X.", 
                       offset);
@@ -886 +886 @@
   if((num_values * sizeof(uint32)) > cell_length-sizeof(uint32))
   {
-    regfi_add_message(file, REGFI_MSG_ERROR, "Too many values found"
+    regfi_add_message(file, REGFI_MSG_WARN, "Too many values found"
                       " while parsing value list at offset 0x%.8X.", offset);
+    /* XXX: During non-strict, should reduce num_values appropriately and
+     *      continue instead of bailing out.
+     */
     return NULL;
   }
@@ -1080 +1083 @@
       if(nk->subkeys == NULL)
       {
-        /* XXX: Should we free the key and bail out here instead?  
-         *      During nonstrict? 
-         */
+        regfi_add_message(file, REGFI_MSG_WARN, "Could not load subkey list"
+                          " while parsing NK record at offset 0x%.8X.", offset);
         nk->num_subkeys = 0;
       }
@@ -1843 +1845 @@
      || (strict && ret_val->cell_size != (ret_val->cell_size & 0xFFFFFFF8)))
   {
-    regfi_add_message(file, REGFI_MSG_ERROR, "A length check failed while"
+    regfi_add_message(file, REGFI_MSG_WARN, "A length check failed while"
                       " parsing NK record at offset 0x%.8X.", offset);
     free(ret_val);
@@ -1961 +1963 @@
                         offset);
     }
-    /* XXX: Should add this back and make it more strict?
-    if(strict && ret_val->classname == NULL)
-        return NULL;
-    */
+
+    if(ret_val->classname == NULL)
+    {
+      regfi_add_message(file, REGFI_MSG_WARN, "Could not parse class"
+                        " name while parsing NK record at offset 0x%.8X.", 
+                        offset);
+      return NULL;
+    }
   }
 
@@ -2303 +2309 @@
       
       if((cell_len == 0) || ((cell_len & 0xFFFFFFF8) != cell_len))
-        /* XXX: should report an error here. */
+      {
+        regfi_add_message(file, REGFI_MSG_ERROR, "Bad cell length encountered"
+                          " while parsing unallocated cells at offset 0x%.8X.",
+                          hbin->file_off+curr_off);
         break;
-      
+      }
+
       /* for some reason the record_size of the last record in
          an hbin block can extend past the end of the block