From 2937a64bbdf8f4793e101b648ab9374e88eb5177 Mon Sep 17 00:00:00 2001
From: matsnow <matsnow@outlook.jp>
Date: Wed, 21 Mar 2018 21:07:21 +0900
Subject: [PATCH] Add error handler to zipfile object

---
 index.js        |   6 ++++++
 test/broken.zip | Bin 0 -> 171 bytes
 test/test.js    |  11 +++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 test/broken.zip

diff --git a/index.js b/index.js
index 8c193e4..682d401 100644
--- a/index.js
+++ b/index.js
@@ -32,6 +32,12 @@ module.exports = function (zipPath, opts, cb) {
 
       var cancelled = false
 
+      zipfile.on('error', function (err) {
+        if (err) {
+          cancelled = true
+          return cb(err)
+        }
+      })
       zipfile.readEntry()
 
       zipfile.on('close', function () {
diff --git a/test/broken.zip b/test/broken.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5aa6788ace4c4b13a1b914810aa7e0b31f376b5d
GIT binary patch
literal 171
zcmWIWW@h1H0D-odr9O({lWSRlY!K#PkYUKkPfyiLNh}Es;bdU`t-mSiFA$eja5FHn
zd}U-{U=abTGc+<b;bQP+WRhdXWsn3=83O}Q1H+O=5DQ@}E5ukdBLloy*+A+TfzS^~
IyMs6k0Np1YIRF3v

literal 0
HcmV?d00001

diff --git a/test/test.js b/test/test.js
index b124527..38a91cc 100644
--- a/test/test.js
+++ b/test/test.js
@@ -11,6 +11,7 @@ var githubZip = path.join(__dirname, 'github.zip')
 var subdirZip = path.join(__dirname, 'file-in-subdir-without-subdir-entry.zip')
 var symlinkDestZip = path.join(__dirname, 'symlink-dest.zip')
 var symlinkZip = path.join(__dirname, 'symlink.zip')
+var brokenZip = path.join(__dirname, 'broken.zip')
 
 var relativeTarget = './cats'
 
@@ -193,3 +194,13 @@ test('files in subdirs where the subdir does not have its own entry is extracted
     })
   })
 })
+
+test('extract broken zip', function (t) {
+  t.plan(2)
+
+  mkdtemp(t, 'broken-zip', function (dirPath) {
+    extract(brokenZip, {dir: dirPath}, function (err) {
+      t.ok(err, 'Error: invalid central directory file header signature: 0x2014b00')
+    })
+  })
+})