Changeset 143 for trunk/lib

Timestamp:

02/12/09 22:24:27 (16 years ago)

Author:

tim

Message:

fixed a null pointer exception

removed some dependencies on less portable items

altered Makefiles to allow for MinGW cross compiling

File:

• trunk/lib/regfi.c (modified) (5 diffs)

trunk/lib/regfi.c

@@ -510 +510 @@
   ret_val = regfi_load_subkeylist_aux(file, offset, max_size, strict, 
                                       REGFI_MAX_SUBKEY_DEPTH);
+  if(ret_val == NULL)
+  {
+    regfi_add_message(file, REGFI_MSG_WARN, "Failed to load subkey list at"
+                      " offset 0x%.8X.", offset);
+    return NULL;
+  }
 
   if(num_keys != ret_val->num_keys)
@@ -1152 +1158 @@
 
   /* open an existing file */
-  if ((fd = open(filename, O_RDONLY)) == -1) 
-  {
-    /* DEBUG(0,("regfi_open: failure to open %s (%s)\n", filename, strerror(errno)));*/
+  if ((fd = open(filename, REGFI_OPEN_FLAGS)) == -1)
+  {
+    /* fprintf(stderr, "regfi_open: failure to open %s (%s)\n", filename, strerror(errno));*/
     return NULL;
   }
@@ -1170 +1176 @@
   if ((rb = regfi_parse_regf(fd, true)) == NULL) 
   {
-    /* DEBUG(0,("regfi_open: Failed to read initial REGF block\n"));*/
+    /* fprintf(stderr, "regfi_open: Failed to read initial REGF block\n"); */
     close(fd);
     return NULL;
@@ -1179 +1185 @@
   if(rb->hbins == NULL)
   {
+    /* fprintf(stderr, "regfi_open: Failed to create HBIN list.\n"); */
     range_list_free(rb->hbins);
     close(fd);
@@ -1331 +1338 @@
    * caching and make things slow.
    */
-  ret_val->sk_recs = lru_cache_create(127, 0x15DEAD05^time(NULL)
-                                           ^(getpid()<<16)^(getppid()<<8),
+  ret_val->sk_recs = lru_cache_create(127, 0x15DEAD05^time(NULL)^(getpid()<<16),
                                       true);