Changeset 139 for trunk/include

Timestamp:

02/08/09 22:06:16 (16 years ago)

Author:

tim

Message:

rewrote subkey list parsing code to include more organized recursion and parsing as well as improved sanity checking

File:

• trunk/include/regfi.h (modified) (5 diffs)

trunk/include/regfi.h

@@ -82 +82 @@
 #define REGFI_OFFSET_NONE          0xffffffff
 
+/* XXX: This is totally arbitrary right now. */
+#define REGFI_MAX_SUBKEY_DEPTH     255    
+
 /* Header sizes and magic number lengths for various records */
 #define REGFI_REGF_MAGIC_SIZE      4
@@ -171 +174 @@
 typedef struct 
 {
-  uint32 nk_off;
+  /* Virtual offset of NK record or additional subkey list, 
+   * depending on this list's type. 
+   */
+  uint32 offset;
+
   uint32 hash;
 } REGFI_SUBKEY_LIST_ELEM;
@@ -178 +185 @@
 typedef struct 
 {
-  uint32 offset;        /* Real offset of this record's cell in the file */
-  uint32 cell_size;      /* ((start_offset - end_offset) & 0xfffffff8) */
-  uint32 num_keys;
+  /* Real offset of this record's cell in the file */
+  uint32 offset;
+
+  uint32 cell_size;
+  
+  /* Number of immediate children */
+  uint32 num_children;  
+
+  /* Total number of keys referenced by this list and it's children */
+  uint32 num_keys;      
+
   REGFI_SUBKEY_LIST_ELEM* elements;
-  
   uint8 magic[REGFI_CELL_MAGIC_SIZE];
+
+  /* Set if the magic indicates this subkey list points to child subkey lists */
+  bool recursive_type;  
 } REGFI_SUBKEY_LIST;
 
@@ -427 +444 @@
                                      uint32 max_size, bool strict);
 
+REGFI_SUBKEY_LIST*    regfi_parse_subkeylist(REGFI_FILE* file, uint32 offset,
+                                             uint32 max_size, bool strict);
+
 REGFI_VK_REC*         regfi_parse_vk(REGFI_FILE* file, uint32 offset, 
                                      uint32 max_size, bool strict);
@@ -467 +487 @@
                                               REGFI_SUBKEY_LIST** lists,
                                               bool strict);
+REGFI_SUBKEY_LIST*    regfi_load_subkeylist_aux(REGFI_FILE* file, uint32 offset,
+                                                uint32 max_size, bool strict,
+                                                uint8 depth_left);
 void                  regfi_add_message(REGFI_FILE* file, uint16 msg_type, 
                                         const char* fmt, ...);