Changelog and version changes for 3.5.0

CHANGES.md

@@ -4,6 +4,13 @@ layout: default
 section: main
 ---
 
+### v3.5.0 2020 2020-05-31
+
+- Fix 'End of data reached' error when file extra field is invalid (see [#544](https://github.com/Stuk/jszip/pull/544)).
+- Typescript definitions: Add null to return types of functions that may return null (see [#669](https://github.com/Stuk/jszip/pull/669)).
+- Typescript definitions: Correct nodeStream's type (see [#682](https://github.com/Stuk/jszip/pull/682))
+- Typescript definitions: Add string output type (see [#666](https://github.com/Stuk/jszip/pull/666))
+
 ### v3.4.0 2020 2020-04-19
 
 - Add Typescript type definitions (see [#601](https://github.com/Stuk/jszip/pull/601)).

dist/jszip.js

@@ -1,6 +1,6 @@
 /*!
 
-JSZip v3.3.0 - A JavaScript class for generating and reading zip files
+JSZip v3.5.0 - A JavaScript class for generating and reading zip files
 <http://stuartk.com/jszip>
 
 (c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
@@ -1057,7 +1057,7 @@ JSZip.defaults = require('./defaults');
 
 // TODO find a better way to handle this version,
 // a require('package.json').version doesn't work with webpack, see #327
-JSZip.version = "3.4.0";
+JSZip.version = "3.5.0";
 
 JSZip.loadAsync = function (content, options) {
     return new JSZip().loadAsync(content, options);
@@ -3976,7 +3976,7 @@ ZipEntry.prototype = {
             this.extraFields = {};
         }
 
-        while (reader.index < end) {
+        while (reader.index + 4 < end) {
             extraFieldId = reader.readInt(2);
             extraFieldLength = reader.readInt(2);
             extraFieldValue = reader.readData(extraFieldLength);
@@ -3987,6 +3987,8 @@ ZipEntry.prototype = {
                 value: extraFieldValue
             };
         }
+
+        reader.setIndex(end);
     },
     /**
      * Apply an UTF8 transformation if needed.

lib/index.js

@@ -42,7 +42,7 @@ JSZip.defaults = require('./defaults');
 
 // TODO find a better way to handle this version,
 // a require('package.json').version doesn't work with webpack, see #327
-JSZip.version = "3.4.0";
+JSZip.version = "3.5.0";
 
 JSZip.loadAsync = function (content, options) {
     return new JSZip().loadAsync(content, options);