Changeset 52

Timestamp:

08/08/05 20:43:07 (19 years ago)

Author:

tim

Message:

fixed a double-free bug which FreeBSD (but not Linux) catches and bails on.

other minor tweaks

Location:

trunk

Files:

• lib/void_stack.c (modified) (3 diffs)
• src/reglookup.c (modified) (3 diffs)

trunk/lib/void_stack.c

@@ -90 +90 @@
 void void_stack_destroy(void_stack* stack)
 {
+  free(stack->elements);
   free(stack);
 }
@@ -99 +100 @@
   for(i=0; i < stack->top; i++)
     free(stack->elements[i]);
+  free(stack->elements);
   free(stack);
 }
@@ -127 +129 @@
   if(stack->top > 0)
   {
-    ret_val = stack->elements[--stack->top];
+    ret_val = stack->elements[--(stack->top)];
     stack->elements[stack->top] = NULL;
   }

trunk/src/reglookup.c

@@ -640 +640 @@
 void printKeyTree(REGF_FILE* f, void_stack* nk_stack, char* prefix)
 {
-  REGF_NK_REC* cur;
-  REGF_NK_REC* sub;
+  REGF_NK_REC* cur = NULL;
+  REGF_NK_REC* sub = NULL;
   char* path = NULL;
   char* val_path = NULL;
@@ -703 +703 @@
                  void_stack* path_stack)
 {
-  REGF_NK_REC* sub; 
-  REGF_NK_REC* cur;
+  REGF_NK_REC* sub = NULL; 
+  REGF_NK_REC* cur = NULL;
   void_stack* sub_nk_stack;
   char* prefix;
+  uint32 prefix_len;
   char* cur_str = NULL;
   bool found_cur = true;
@@ -765 +766 @@
       sub_nk_stack = void_stack_new(1024);
       void_stack_push(sub_nk_stack, sub);
-      void_stack_push(nk_stack, sub);
       prefix = stack2Path(nk_stack);
+      prefix_len = strlen(prefix);
+      prefix = realloc(prefix, prefix_len+strlen(sub->keyname)+2);
+      if(prefix == NULL)
+        return -1;
+      strcat(prefix, "/");
+      strcat(prefix, sub->keyname);
       printKeyTree(f, sub_nk_stack, prefix);
       return 0;