Merge branch 'master' into bug-234-fix

cthackers · Oct 11, 2018 · 6306ee9 · 6306ee9
2 parents ca2afb5 + 83d44ba
commit 6306ee9
Show file tree

Hide file tree

Showing 14 changed files with 255 additions and 2,045 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ sudo: false
 language: node_js
 
 node_js:
+  - 8
   - 6
-  - 4
 
 cache:
   directories:
@@ -13,3 +13,6 @@ cache:
 install:
   - npm i -g npm@latest
   - npm install
+
+script:
+  - npm test
diff --git a/adm-zip.js b/adm-zip.js
@@ -113,7 +113,12 @@ module.exports = function (/*String*/input) {
 		readAsTextAsync: function (/*Object*/entry, /*Function*/callback, /*String - Optional*/encoding) {
 			var item = getEntry(entry);
 			if (item) {
-				item.getDataAsync(function (data) {
+				item.getDataAsync(function (data, err) {
+					if (err) {
+						callback(data, err);
+						return;
+					}
+
 					if (data && data.length) {
 						callback(data.toString(encoding || "utf8"));
 					} else {
@@ -358,7 +363,7 @@ module.exports = function (/*String*/input) {
 
 			var entryName = item.entryName;
 
-			var target = sanitize(targetPath, pth.resolve(targetPath, maintainEntryPath ? entryName : pth.basename(entryName)));
+			var target = sanitize(targetPath, maintainEntryPath ? entryName : pth.basename(entryName));
 
 			if (item.isDirectory) {
 				target = pth.resolve(target, "..");
@@ -369,9 +374,9 @@ module.exports = function (/*String*/input) {
 					if (!content) {
 						throw Utils.Errors.CANT_EXTRACT_FILE;
 					}
-					var childName = sanitize(targetPath, child.entryName);
+					var childName = sanitize(targetPath, maintainEntryPath ? child.entryName : pth.basename(child.entryName));
 
-					Utils.writeFileTo(pth.resolve(targetPath, maintainEntryPath ? childName : childName.substr(entryName.length)), content, overwrite);
+					Utils.writeFileTo(childName, content, overwrite);
 				});
 				return true;
 			}
@@ -470,8 +475,12 @@ module.exports = function (/*String*/input) {
 						callback(undefined);
 					return;
 				}
-				entry.getDataAsync(function (content) {
+				entry.getDataAsync(function (content, err) {
 					if (i <= 0) return;
+					if (err) {
+						callback(new Error(err));
+						return;
+					}
 					if (!content) {
 						i = 0;
 						callback(new Error(Utils.Errors.CANT_EXTRACT_FILE));

diff --git a/headers/entryHeader.js b/headers/entryHeader.js
@@ -213,7 +213,7 @@ module.exports = function () {
             // modification time (2 bytes time, 2 bytes date)
             data.writeUInt32LE(_time, Constants.CENTIM);
             // uncompressed file crc-32 value
-            data.writeUInt32LE(_crc, Constants.CENCRC);
+            data.writeInt32LE(_crc & 0xFFFF, Constants.CENCRC, true);
             // compressed size
             data.writeUInt32LE(_compressedSize, Constants.CENSIZ);
             // uncompressed size