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

Timestamp:

03/01/09 21:17:46 (15 years ago)

Author:

tim

Message:

integrated talloc into most of the rest of the regfi library
fixed a length validation issue

File:

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

trunk/src/reglookup-recover.c

@@ -15 +15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Id$
@@ -84 +84 @@
     quoted_name = malloc(1*sizeof(char));
     if(quoted_name == NULL)
-      bailOut(REGLOOKUP_EXIT_OSERR, "ERROR: Could not allocate sufficient memory.\n");
+      bailOut(REGLOOKUP_EXIT_OSERR, 
+              "ERROR: Could not allocate sufficient memory.\n");
     quoted_name[0] = '\0';
 
@@ -297 +298 @@
           virt_offset = cur_ancestor->parent_off;
         
-        path_element = (struct name_holder*)malloc(sizeof(struct name_holder));
+        path_element = talloc(path_stack, struct name_holder);
         if(path_element != NULL)
           path_element->quoted_name = quote_string(cur_ancestor->keyname, 
@@ -305 +306 @@
            || !void_stack_push(path_stack, path_element))
         {
-          free(cur_ancestor->keyname);
-          free(cur_ancestor);
-          void_stack_free_deep(path_stack);
+          /* XXX: Need to add a warning here */
+          regfi_free_key(cur_ancestor);
+          void_stack_free(path_stack);
           return NULL;
         }
@@ -318 +319 @@
         ret_val_size += path_element->length + 1;
 
-        regfi_key_free(cur_ancestor);
+        regfi_free_key(cur_ancestor);
       }
     }
@@ -328 +329 @@
   if(ret_val == NULL)
   {
-    void_stack_free_deep(path_stack);
+    void_stack_free(path_stack);
     return NULL;
   }
@@ -340 +341 @@
     ret_val_used += path_element->length + 1;
     free(path_element->quoted_name);
-    free(path_element);
+    talloc_free(path_element);
   }
   void_stack_free(path_stack);
@@ -532 +533 @@
   REGFI_NK_REC* key;
   uint32 i, j;
+  int error_code = 0;
 
   for(i=0; i < range_list_size(unalloc_cells); i++)
@@ -550 +552 @@
         {
           fprintf(stderr, "ERROR: Couldn't add key to unalloc_keys.\n");
-          return 20;
+          error_code = 20;
+          goto fail;
         }
+        talloc_steal(unalloc_keys, key);
         j+=key->cell_size-8;
       }
@@ -561 +565 @@
     cur_elem = range_list_get(unalloc_keys, i);
     if(!removeRange(unalloc_cells, cur_elem->offset, cur_elem->length))
-      return 30;
+    {
+      error_code = 30;
+      goto fail;
+    }
   }
 
   return 0;
+
+ fail:
+  regfi_free_key(key);
+  return error_code;
 }
 
@@ -611 +622 @@
              * so prune it.
              */
-            free(nk->values->elements);
-            free(nk->values);
+            talloc_free(nk->values);
             nk->values = NULL;
           }
@@ -639 +649 @@
                                      vk->cell_size, vk))
                   {
-                    free(vk);
+                    talloc_free(vk);
                     return 30;
                   }
@@ -647 +657 @@
                 }
                 else
-                  free(vk);
+                  talloc_free(vk);
               }
             }