Reporting correct compressed/uncompressed file sizes for zip64 file entries

Author: ukeller

dist/jszip.js

@@ -1,6 +1,6 @@
 /*!
 
-JSZip v3.2.1 - A JavaScript class for generating and reading zip files
+JSZip v3.2.2 - A JavaScript class for generating and reading zip files
 <http://stuartk.com/jszip>
 
 (c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
@@ -1859,6 +1859,22 @@ DataReader.prototype = {
         this.index += size;
         return result;
     },
+    /**
+     * Get the next number with a given byte size.
+     * Same as readInt but using * 256 so there is no conversion to int32.
+     * @param {number} size the number of bytes to read.
+     * @return {number} the corresponding number.
+     */
+    readLong: function(size) {
+        var result = 0,
+            i;
+        this.checkOffset(size);
+        for (i = this.index + size - 1; i >= this.index; i--) {
+            result = (result * 256) + this.byteAt(i);
+        }
+        this.index += size;
+        return result;
+    },
     /**
      * Get the next string with a given byte size.
      * @param {number} size the number of bytes to read.
@@ -3950,13 +3966,13 @@ ZipEntry.prototype = {
         // I really hope that these 64bits integer can fit in 32 bits integer, because js
         // won't let us have more.
         if (this.uncompressedSize === utils.MAX_VALUE_32BITS) {
-            this.uncompressedSize = extraReader.readInt(8);
+            this.uncompressedSize = extraReader.readLong(8);
         }
         if (this.compressedSize === utils.MAX_VALUE_32BITS) {
-            this.compressedSize = extraReader.readInt(8);
+            this.compressedSize = extraReader.readLong(8);
         }
         if (this.localHeaderOffset === utils.MAX_VALUE_32BITS) {
-            this.localHeaderOffset = extraReader.readInt(8);
+            this.localHeaderOffset = extraReader.readLong(8);
         }
         if (this.diskNumberStart === utils.MAX_VALUE_32BITS) {
             this.diskNumberStart = extraReader.readInt(4);
@@ -4608,7 +4624,7 @@ var Z_DEFLATED  = 8;
 /* internal
  * Deflate.chunks -> Array
  *
- * Chunks of output data, if [[Deflate#onData]] not overridden.
+ * Chunks of output data, if [[Deflate#onData]] not overriden.
  **/
 
 /**
@@ -4850,7 +4866,7 @@ Deflate.prototype.push = function (data, mode) {
 
 /**
  * Deflate#onData(chunk) -> Void
- * - chunk (Uint8Array|Array|String): output data. Type of array depends
+ * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
  *   on js engine support. When string output requested, each chunk
  *   will be string.
  *
@@ -4993,7 +5009,7 @@ var toString = Object.prototype.toString;
 /* internal
  * inflate.chunks -> Array
  *
- * Chunks of output data, if [[Inflate#onData]] not overridden.
+ * Chunks of output data, if [[Inflate#onData]] not overriden.
  **/
 
 /**
@@ -5268,7 +5284,7 @@ Inflate.prototype.push = function (data, mode) {
 
 /**
  * Inflate#onData(chunk) -> Void
- * - chunk (Uint8Array|Array|String): output data. Type of array depends
+ * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
  *   on js engine support. When string output requested, each chunk
  *   will be string.
  *
@@ -5295,7 +5311,7 @@ Inflate.prototype.onEnd = function (status) {
   if (status === c.Z_OK) {
     if (this.options.to === 'string') {
       // Glue & convert here, until we teach pako to send
-      // utf8 aligned strings to onData
+      // utf8 alligned strings to onData
       this.result = this.chunks.join('');
     } else {
       this.result = utils.flattenChunks(this.chunks);

dist/jszip.min.js

@@ -66,6 +66,22 @@ DataReader.prototype = {
         this.index += size;
         return result;
     },
+    /**
+     * Get the next number with a given byte size.
+     * Same as readInt but using * 256 so there is no conversion to int32.
+     * @param {number} size the number of bytes to read.
+     * @return {number} the corresponding number.
+     */
+    readLong: function(size) {
+        var result = 0,
+            i;
+        this.checkOffset(size);
+        for (i = this.index + size - 1; i >= this.index; i--) {
+            result = (result * 256) + this.byteAt(i);
+        }
+        this.index += size;
+        return result;
+    },
     /**
      * Get the next string with a given byte size.
      * @param {number} size the number of bytes to read.

lib/reader/DataReader.js

@@ -174,13 +174,13 @@ ZipEntry.prototype = {
         // I really hope that these 64bits integer can fit in 32 bits integer, because js
         // won't let us have more.
         if (this.uncompressedSize === utils.MAX_VALUE_32BITS) {
-            this.uncompressedSize = extraReader.readInt(8);
+            this.uncompressedSize = extraReader.readLong(8);
         }
         if (this.compressedSize === utils.MAX_VALUE_32BITS) {
-            this.compressedSize = extraReader.readInt(8);
+            this.compressedSize = extraReader.readLong(8);
         }
         if (this.localHeaderOffset === utils.MAX_VALUE_32BITS) {
-            this.localHeaderOffset = extraReader.readInt(8);
+            this.localHeaderOffset = extraReader.readLong(8);
         }
         if (this.diskNumberStart === utils.MAX_VALUE_32BITS) {
             this.diskNumberStart = extraReader.readInt(4);