Changeset 113 for trunk/src/reglookup-recover.c

Timestamp:

05/04/08 14:29:02 (16 years ago)

Author:

tim

Message:

fixed some VK record parsing bugs

added more strict checking on unallocated ranges

File:

• trunk/src/reglookup-recover.c (modified) (10 diffs)

trunk/src/reglookup-recover.c

@@ -418 +418 @@
 
 
-bool removeRange(range_list* rl, uint32 rm_idx, uint32 offset, uint32 length)
-{
-  const range_list_element* cur_elem = range_list_get(rl, rm_idx);
-  
+bool removeRange(range_list* rl, uint32 offset, uint32 length)
+{
+  int32 rm_idx;
+  const range_list_element* cur_elem;
+  
+  rm_idx = range_list_find(rl, offset);
+  if(rm_idx < 0)
+    return false;
+
+  cur_elem = range_list_get(rl, rm_idx);
   if(cur_elem == NULL)
   {
@@ -481 +487 @@
         }
         
-        if(!removeRange(unalloc_cells, i, key->offset, key->cell_size))
+        if(!removeRange(unalloc_cells, key->offset, key->cell_size))
           return 30;
       }
@@ -499 +505 @@
   const range_list_element* cur_elem;
   uint32 i, j, num_keys, off, values_length, max_length;
-  int32 idx;
 
   num_keys=range_list_size(unalloc_keys);
@@ -529 +534 @@
         if(nk->values != NULL)
         {
-          idx = range_list_find(unalloc_cells, off);
-          if(idx < 0)
+          if(!range_list_has_range(unalloc_cells, off, nk->cell_size))
           { /* We've parsed a values-list which isn't in the unallocated list,
              * so prune it. 
@@ -553 +557 @@
             if(values_length != (values_length & 0xFFFFFFF8))
               values_length = (values_length & 0xFFFFFFF8) + 8;
-            if(!removeRange(unalloc_cells, idx, off, values_length))
+
+            if(!removeRange(unalloc_cells, off, values_length))
               return 20;
 
@@ -560 +565 @@
               if(nk->values[j] != NULL)
               {
-                idx = range_list_find(unalloc_cells, nk->values[j]->offset);
-                if(idx < 0)
+                if(!range_list_has_range(unalloc_cells, nk->values[j]->offset, 
+                                         nk->values[j]->cell_size))
                 { /* We've parsed a value which isn't in the unallocated list,
                    * so prune it.
@@ -575 +580 @@
                    * and inspect data.
                    */
-                  if(!removeRange(unalloc_cells, idx, nk->values[j]->offset,
+                  if(!removeRange(unalloc_cells, nk->values[j]->offset,
                                   nk->values[j]->cell_size))
                     return 21;
 
                   /* Don't bother pruning or removing from unalloc_cells if 
-                   * there is no data, if it is stored the offset.
+                   * there is no data, or it is stored in the offset.
                    */
                   if(nk->values[j]->data != NULL && !nk->values[j]->data_in_offset)
                   {
                     off = nk->values[j]->data_off+REGF_BLOCKSIZE;
-                    idx = range_list_find(unalloc_cells, off);
-                    if(idx < 0)
+                    if(!range_list_has_range(unalloc_cells, off, 
+                                             nk->values[j]->data_size))
                     { /* We've parsed a data cell which isn't in the unallocated 
                        * list, so prune it.
@@ -595 +600 @@
                     else
                     { /*A data record was recovered. Remove from unalloc_cells.*/
-                      if(!removeRange(unalloc_cells, idx, off,
+                      if(!removeRange(unalloc_cells, off, 
                                       nk->values[j]->data_size))
                         return 22;
@@ -638 +643 @@
         }
         
-        if(!removeRange(unalloc_cells, i, vk->offset, vk->cell_size))
+        if(!removeRange(unalloc_cells, vk->offset, vk->cell_size))
           return 30;
       }
@@ -672 +677 @@
         }
         
-        if(!removeRange(unalloc_cells, i, sk->offset, sk->cell_size))
+        if(!removeRange(unalloc_cells, sk->offset, sk->cell_size))
           return 30;
       }