Changeset 136 for trunk/lib

Timestamp:

01/23/09 12:29:51 (16 years ago)

Author:

tim

Message:

fixed various integer issues and memory allocation issues

polished error message functions and added initial messages in a few places

Location:

trunk/lib

Files:

• lru_cache.c (modified) (1 diff)
• regfi.c (modified) (8 diffs)
• smb_deps.c (modified) (1 diff)

trunk/lib/lru_cache.c

@@ -236 +236 @@
         return false;
       }
+      else
+        e->index = tmp_index;
     }
     else

trunk/lib/regfi.c

@@ -37 +37 @@
 /******************************************************************************
  ******************************************************************************/
-void regfi_add_message(REGFI_FILE* file, const char* error)
-{
-  /* XXX: This function is not particularly efficient, 
+void regfi_add_message(REGFI_FILE* file, const char* fmt, ...)
+{
+  /* XXX: This function is not particularly efficient,
    *      but then it is mostly used during errors. 
    */
-  uint32 length;
-  char* tmp;
+  /* XXX: Should we add support for filtering by levels of severity? */
+  uint32 buf_size, buf_used;
+  char* new_msg;
+  va_list args;
 
   if(file->last_message == NULL)
-    length = 0;
+    buf_used = 0;
   else
-    length = strlen(error);
-
-  tmp = realloc(file->last_message, length+strlen(file->last_message)+2);
-  if(tmp == NULL)
-    /* XXX: should we do something else here?  */
+    buf_used = strlen(file->last_message);
+
+  buf_size = buf_used+strlen(fmt)+2+128;
+  new_msg = realloc(file->last_message, buf_size);
+  if(new_msg == NULL)
+    /* XXX: should we report this? */
     return;
   
-  if(length > 0)
-    strcat(tmp, "\n");
-  strcat(tmp, error);
+  va_start(args, fmt);
+  vsnprintf(new_msg+buf_used, buf_size-buf_used, fmt, args);
+  va_end(args);
+  strncat(new_msg, "\n", buf_size-1);
+
+  file->last_message = new_msg;
 }
 
@@ -63 +69 @@
 /******************************************************************************
  ******************************************************************************/
-char* regfi_get_message(REGFI_FILE* file)
+char* regfi_get_messages(REGFI_FILE* file)
 {
   char* ret_val = file->last_message;
@@ -310 +316 @@
       /* XXX: this is slow */
       extra = strlen(sid_str) + strlen(type_str) 
-        + strlen(perms_str) + strlen(flags_str)+5;
+        + strlen(perms_str) + strlen(flags_str) + 5;
       tmp_val = realloc(ret_val, size+extra);
 
@@ -316 +322 @@
       {
         free(ret_val);
+        ret_val = NULL;
         failed = true;
       }
@@ -840 +847 @@
     return NULL;
 
-  ret_val = (REGFI_VK_REC**)zalloc(sizeof(REGFI_VK_REC*) * num_values);
+  ret_val = (REGFI_VK_REC**)zalloc(sizeof(REGFI_VK_REC*) * usable_num_values);
   if(ret_val == NULL)
   {
@@ -1375 +1382 @@
 const REGFI_SK_REC* regfi_iterator_cur_sk(REGFI_ITERATOR* i)
 {
-  REGFI_SK_REC* ret_val;
+  REGFI_SK_REC* ret_val = NULL;
   REGFI_HBIN* hbin;
   uint32 max_length, off;
@@ -1982 +1989 @@
     if(ret_val->data_in_offset)
     {
-      ret_val->data = regfi_parse_data(file, data_offset, 
+      ret_val->data = regfi_parse_data(file, ret_val->data_off, 
                                        raw_data_size, 4, strict);
     }
@@ -2030 +2037 @@
       return NULL;
 
-    offset = offset - REGFI_REGF_SIZE;
     for(i = 0; i < length; i++)
       ret_val[i] = (uint8)((offset >> i*8) & 0xFF);

trunk/lib/smb_deps.c

@@ -33 +33 @@
 {
   void* ret_val = NULL;
-  if((ret_val = (void*)malloc(size)) != NULL)
+  if((size > 0) && (ret_val = (void*)malloc(size)) != NULL)
     memset(ret_val, 0, size);
+
   return ret_val;
 }