Merge pull request #15 from hclander/master

Modifications to deal with files with size > 4 Gb

archive.c

@@ -524,7 +524,7 @@ archive_find_file (ArchiveIndex *archive_index, const char *path,
     }
     current = current->next;
     if (*position + file->fsstat.file_size >= (u64) stat_buf.st_size) {
-      *position = 0x50;
+      *position = 0x50 + (*position + file->fsstat.file_size) % stat_buf.st_size;
       (*index)++;
       snprintf (data_path, sizeof(data_path), "%s/%s_%02d.dat", path, archive_index->prefix, *index);
       if (stat (data_path, &stat_buf) != 0)
@@ -551,7 +551,7 @@ archive_extract (ArchiveIndex *archive_index, const char *path, u32 index,
     die ("Couldn't open output file : %s\n", output);
 
   while (size > 0) {
-    int read;
+    u64 read; // fix a potential overflow
 
     snprintf (filename, sizeof(filename), "%s/%s_%02d.dat", path, archive_index->prefix, index);
     if (!archive_open (filename, &in, &dat_header))

paged_file.c

@@ -301,12 +301,12 @@ paged_file_splice (PagedFile *f, PagedFile *from, u64 len)
 {
   char buffer[1024];
   u64 total = 0;
-  int size;
+  u64 size; // fixed to prevent overflow in size = len - total below
   int read;
 
   while (len == (u64)-1 || total < len) {
     size = len - total;
-    if (len == (u64)-1 || (u32) size > sizeof(buffer))
+    if (len == (u64)-1 || size > sizeof(buffer))
       size = sizeof(buffer);
 
     read = paged_file_read (from, buffer, size);