commit a1f8e2c281ff9e03846a3e02cafed2d1b93d533e
author Dieter Baron <dillo@nih.at> Tue May 14 22:21:34 2013 +0200
committer Dieter Baron <dillo@nih.at> Tue May 14 22:21:34 2013 +0200
tree 2262960ccd16b3be6ddea3c4ea5444405af80829
parent 9aef197e71c07faeb93a15fc0eaf55bc04451d2d

More lossy integer conversion fixes, for 32bit builds.  Based on patch by Jan Weiß.

lib/zip_source_filep.c

diff --git a/lib/zip_source_filep.c b/lib/zip_source_filep.c
index 0bd2d68..fcebe73 100644
--- a/lib/zip_source_filep.c
+++ b/lib/zip_source_filep.c
@@ -125,7 +125,8 @@
 {
     struct read_file *z;
     char *buf;
-    size_t i, n;
+    zip_uint64_t n;
+    size_t i;
 
     z = (struct read_file *)state;
     buf = (char *)data;
@@ -151,11 +152,13 @@
 	return 0;
 	
     case ZIP_SOURCE_READ:
-	/* XXX: return INVAL if len > size_t max */
 	if (z->remain != -1)
 	    n = len > (zip_uint64_t)z->remain ? (zip_uint64_t)z->remain : len;
 	else
 	    n = len;
+            
+        if (n > SIZE_MAX)
+            n = SIZE_MAX;
 
 	if (!z->closep) {
 	    /* we might share this file with others, so let's be safe */
@@ -166,7 +169,7 @@
 	    }
 	}
 
-	if ((i=fread(buf, 1, n, z->f)) == 0) {
+	if ((i=fread(buf, 1, (size_t)n, z->f)) == 0) {
             if (ferror(z->f)) {
                 z->e[0] = ZIP_ER_READ;
                 z->e[1] = errno;