Changeset 136 for trunk/src

Timestamp:

01/23/09 12:29:51 (15 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/src

Files:

• common.c (modified) (4 diffs)
• reglookup-recover.c (modified) (2 diffs)
• reglookup.c (modified) (5 diffs)

trunk/src/common.c

@@ -52 +52 @@
 
   unsigned int buf_len = sizeof(char)*(len+1);
-  char* ret_val = malloc(buf_len);
+  char* ret_val = NULL; 
   char* tmp_buf;
 
+  if(buf_len > 0) 
+    ret_val = malloc(buf_len);
   if(ret_val == NULL)
     return NULL;
@@ -155 +157 @@
 {
   char* ret_val;
-  char* ascii;
+  char* ascii = NULL;
   char* tmp_err;
   int ret_err;
   *error_msg = NULL;
 
-  ascii = malloc(length+1);
+  if(length+1 > 0)
+    ascii = malloc(length+1);
   if(ascii == NULL)
   {
@@ -175 +178 @@
     free(ascii);
     tmp_err = strerror(-ret_err);
-    *error_msg = (char*)malloc(54+strlen(tmp_err));
+    *error_msg = (char*)malloc(61+strlen(tmp_err));
     if(*error_msg == NULL)
-    {
-      free(ascii);
-      return NULL;
-    }
+      return NULL;
 
     sprintf(*error_msg, 
@@ -305 +305 @@
     {
       tmp_err = strerror(-ret_err);
-      *error_msg = (char*)malloc(54+strlen(tmp_err));
+      *error_msg = (char*)malloc(61+strlen(tmp_err));
       if(*error_msg == NULL)
+      {
+        free(ascii_tmp);
         return NULL;
+      }
+
       sprintf(*error_msg, "MULTI_SZ unicode conversion"
               " failed with '%s'. Quoting as binary.", tmp_err);

trunk/src/reglookup-recover.c

@@ -99 +99 @@
   if(print_parsedraw)
     free(quoted_raw);
+  free(quoted_name);
 }
 
@@ -829 +830 @@
       tmp_path = (char*)malloc(strlen(parent_paths[i])+strlen(tmp_name)+2);
       if(tmp_path == NULL)
+      {
+        free(tmp_name);
         return 10;
+      }
+
       sprintf(tmp_path, "%s/%s", parent_paths[i], tmp_name);
       for(j=0; j < tmp_key->num_values; j++)

trunk/src/reglookup.c

@@ -255 +255 @@
       if((new_buf = realloc(buf, buf_len)) == NULL)
       {
+        free(name);
         free(buf);
         free(iter);
@@ -372 +373 @@
   const REGFI_NK_REC* sub = NULL;
   char* path = NULL;
+  char* msgs = NULL;
   int key_type = regfi_type_str2val("KEY");
   bool print_this = true;
@@ -377 +379 @@
   root = cur = regfi_iterator_cur_key(iter);
   sub = regfi_iterator_first_subkey(iter);
-  
+  msgs = regfi_get_messages(iter->f);
+  if(msgs != NULL)
+    fprintf(stderr, "%s", msgs);
   if(root == NULL)
     bailOut(EX_DATAERR, "ERROR: root cannot be NULL.\n");
@@ -455 +459 @@
   /* Strip any potential value name at end of path */
   for(i=0; 
-      (path[i] != NULL) && (path[i+1] != NULL) 
-        && (i < REGFI_MAX_DEPTH+1+1);
+      (path[i] != NULL) && (path[i+1] != NULL) && (i < REGFI_MAX_DEPTH+1);
       i++)
-    tmp_path[i] = path[i];
-
+  { tmp_path[i] = path[i]; }
   tmp_path[i] = NULL;
 
@@ -471 +473 @@
     if(print_verbose)
       fprintf(stderr, "VERBOSE: Found final path element as root key.\n");
+    free(tmp_path);
     return 2;
   }