Changeset 148 for trunk/lib/regfi.c

Timestamp:

02/22/09 18:22:59 (15 years ago)

Author:

tim

Message:

integrated talloc into range_list

fixed some uninitialized structure values in the winsec library

File:

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

trunk/lib/regfi.c

@@ -343 +343 @@
       {
         ret_val = tmp_val;
-        size += snprintf(ret_val+size, extra, "%s%s%c%s%c%s%c%s",
-                         ace_delim,sid_str,
-                         field_delim,type_str,
-                         field_delim,perms_str,
-                         field_delim,flags_str);
+        size += sprintf(ret_val+size, "%s%s%c%s%c%s%c%s",
+                        ace_delim,sid_str,
+                        field_delim,type_str,
+                        field_delim,perms_str,
+                        field_delim,flags_str);
         ace_delim = "|";
       }
@@ -1279 +1279 @@
   {
     rla = range_list_add(rb->hbins, hbin->file_off, hbin->block_size, hbin);
+    if(rla)
+      talloc_steal(rb->hbins, hbin);
     hbin_off = hbin->file_off + hbin->block_size;
     hbin = regfi_parse_hbin(rb, hbin_off, true);
   }
-
 
   /* This secret isn't very secret, but we don't need a good one.  This 
@@ -1301 +1302 @@
 
 
-/*******************************************************************
- *******************************************************************/
+/******************************************************************************
+ ******************************************************************************/
 int regfi_close(REGFI_FILE *file)
 {
   int fd;
-  uint32 i;
 
   /* nothing to do if there is no open file */
@@ -1314 +1314 @@
   fd = file->fd;
   file->fd = -1;
-  for(i=0; i < range_list_size(file->hbins); i++)
-    free(range_list_get(file->hbins, i)->data);
+
   range_list_free(file->hbins);
 
-  
   if(file->sk_cache != NULL)
     lru_cache_destroy(file->sk_cache);
+
   free(file);
-
   return close(fd);
 }
@@ -1330 +1328 @@
  * There should be only *one* root key in the registry file based 
  * on my experience.  --jerry
- *****************************************************************************/
+ ******************************************************************************/
 REGFI_NK_REC* regfi_rootkey(REGFI_FILE *file)
 {
@@ -1791 +1789 @@
 
 
-/*******************************************************************
+/******************************************************************************
  * Given real file offset, read and parse the hbin at that location
  * along with it's associated cells.
- *******************************************************************/
-/* XXX: Need a way to return types of errors.
- */
+ ******************************************************************************/
 REGFI_HBIN* regfi_parse_hbin(REGFI_FILE* file, uint32 offset, bool strict)
 {
@@ -1825 +1821 @@
   }
 
-  if(!(hbin = (REGFI_HBIN*)zalloc(sizeof(REGFI_HBIN)))) 
+  hbin = talloc(NULL, REGFI_HBIN);
+  if(hbin == NULL)
     return NULL;
   hbin->file_off = offset;
@@ -1836 +1833 @@
                       " 0x%.8X.", hbin->magic[0], hbin->magic[1], 
                       hbin->magic[2], hbin->magic[3], offset);
-    free(hbin);
+    talloc_free(hbin);
     return NULL;
   }
@@ -1858 +1855 @@
                       " or runs off the end of the file"
                       " while parsing hbin at offset 0x%.8X.", offset);
-    free(hbin);
+    talloc_free(hbin);
     return NULL;
   }