Changeset 154 for trunk/lib

Timestamp:

06/03/09 11:21:47 (15 years ago)

Author:

tim

Message:

fixed a parsing flaw in big data chunk concatenation

File:

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

trunk/lib/regfi.c

@@ -2396 +2396 @@
     }
 
-    if(chunk_length-4 > data_left)
+    /* XXX: This should be "chunk_length-4" to account for the 4 byte cell 
+     *      length.  However, it has been observed that some (all?) chunks
+     *      have an additional 4 bytes of 0 at the end of their cells that 
+     *      isn't part of the data, so we're trimming that off too. 
+     */
+    if(chunk_length-8 >= data_left)
       read_length = data_left;
     else
-      read_length = chunk_length-4;
+      read_length = chunk_length-8;
 
     if(regfi_read(file->fd, ret_val.buf+(data_length-data_left), 
@@ -2415 +2420 @@
     data_left -= read_length;
   }
-
   free(indirect_ptrs);
   ret_val.len = data_length-data_left;
+
   return ret_val;