Changeset 133 for trunk/lib/regfi.c

Timestamp:

01/12/09 12:07:58 (15 years ago)

Author:

tim

Message:

minor changes to winsec library

fixed major bug with data_in_offset values

File:

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

trunk/lib/regfi.c

@@ -688 +688 @@
   }
 
+  /* XXX: call should look more like: */
+  /*if (!(ret_val->sec_desc = winsec_parse_desc(sec_desc_buf, ret_val->desc_size)))*/
   if (!sec_io_desc("sec_desc", &ret_val->sec_desc, &ps, 0))
   {
@@ -794 +796 @@
       return NULL;
     }
-    
+
     vk_offset =  voffsets[i] + REGF_BLOCKSIZE;
     vk_max_length = hbin->block_size + hbin->file_off - vk_offset;
@@ -853 +855 @@
       else
         nk->values = NULL;
+
     }
     else
@@ -865 +868 @@
         return NULL;
       }
+
     }
   }
@@ -1239 +1243 @@
   bool found = false;
   uint32 old_subkey = i->cur_subkey;
-  
+
   if(subkey_name == NULL)
     return false;
@@ -1358 +1362 @@
 
   nk_offset = i->cur_key->subkeys->elements[i->cur_subkey].nk_off;
-  
+
   return regfi_load_key(i->f, nk_offset+REGF_BLOCKSIZE, true);
 }
@@ -1881 +1885 @@
     }
     ret_val->valuename[ret_val->name_length] = '\0';
+
   }
   else
@@ -1896 +1901 @@
   else
   {
-    hbin = regfi_lookup_hbin(file, ret_val->data_off);
-    if(hbin)
-    {
-      data_offset = ret_val->data_off+REGF_BLOCKSIZE;
-      data_maxsize = hbin->block_size + hbin->file_off - data_offset;
-      ret_val->data = regfi_parse_data(file, data_offset, raw_data_size,
-                                       data_maxsize, strict);
+    if(ret_val->data_in_offset)
+    {
+      ret_val->data = regfi_parse_data(file, data_offset, 
+                                       raw_data_size, 4, strict);
     }
     else
-      ret_val->data = NULL;
+    {
+      hbin = regfi_lookup_hbin(file, ret_val->data_off);
+      if(hbin)
+      {
+        data_offset = ret_val->data_off+REGF_BLOCKSIZE;
+        data_maxsize = hbin->block_size + hbin->file_off - data_offset;
+        ret_val->data = regfi_parse_data(file, data_offset, raw_data_size,
+                                         data_maxsize, strict);
+        
+      }
+      else
+        ret_val->data = NULL;
+    }
 
     if(strict && (ret_val->data == NULL))